Merge master

[netatalk.git] / etc / afpd / file.h

diff --git a/etc/afpd/file.h b/etc/afpd/file.h
index 3c64e7ddca603fe46c8f73de206fe3ed69fba262..76485a3f87f23e2abe89e7979c427f4f6f6d99a7 100644 (file)
--- a/etc/afpd/file.h
+++ b/etc/afpd/file.h
@@ -1,6 +1,4 @@
 /*
- * $Id: file.h,v 1.26 2010/03/12 15:16:49 franklahm Exp $
- *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -28,11 +26,10 @@
 
 /*#include <sys/stat.h>*/ /* including it here causes some confusion */
 #include <sys/param.h>
-#include <sys/cdefs.h>
-#include <netatalk/endian.h>
+#include <arpa/inet.h>
 #include <atalk/adouble.h>
+#include <atalk/globals.h>
 
-#include "globals.h"
 #include "volume.h"
 #include "directory.h"
 
@@ -106,20 +103,20 @@ typedef enum {
   kTextEncodingMacKeyboardGlyphs = 41,
 } kTextEncoding_t;
 
-extern char *set_name   (const struct vol *, char *, cnid_t, char *, cnid_t, u_int32_t );
+extern char *set_name   (const struct vol *, char *, cnid_t, char *, cnid_t, uint32_t );
 
 extern struct extmap   *getextmap (const char *);
 extern struct extmap   *getdefextmap (void);
 
-extern int getfilparams (struct vol *, u_int16_t, struct path *,
-                                 struct dir *, char *buf, size_t *);
+extern int getfilparams (struct vol *, uint16_t, struct path *,
+                         struct dir *, char *buf, size_t *);
 
-extern int setfilparams (struct vol *, struct path *, u_int16_t, char *);
+extern int setfilparams (struct vol *, struct path *, uint16_t, char *);
 extern int renamefile   (const struct vol *, int, char *, char *, char *, struct adouble *);
 extern int copyfile     (const struct vol *, const struct vol *, int, char *, char *, char *, struct adouble *);
 extern int deletefile   (const struct vol *, int, char *, int);
 
-extern int getmetadata  (struct vol *vol, u_int16_t bitmap, struct path *path, 
+extern int getmetadata  (struct vol *vol, uint16_t bitmap, struct path *path, 
                          struct dir *dir, char *buf, size_t *buflen, struct adouble *adp);
 
 extern void *get_finderinfo (const struct vol *, const char *, struct adouble *, void *, int);
@@ -127,8 +124,12 @@ extern void *get_finderinfo (const struct vol *, const char *, struct adouble *,
 extern size_t mtoUTF8   (const struct vol *, const char *, size_t , char *, size_t );
 extern int  copy_path_name (const struct vol *, char *, char *i);
 
-extern uint32_t get_id  (struct vol *, struct adouble *, const struct stat *,
-                         const cnid_t , char *, const int );
+extern uint32_t get_id  (struct vol *,
+                         struct adouble *,
+                         const struct stat *,
+                         cnid_t ,
+                         const char *,
+                         int );
 
 /* FP functions */
 int afp_exchangefiles (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);