remove gcc warnings and cleanup inline mess

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

diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h
index 1eed0e48a92ed9f4f35ac68e273d5e0a6c368a80..12b64790434ca173248ec3ab7f86b0d2cf324c94 100644 (file)
--- a/etc/afpd/directory.h
+++ b/etc/afpd/directory.h
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.h,v 1.13 2003-04-20 06:53:40 didg Exp $
+ * $Id: directory.h,v 1.13.2.4.2.2.2.1 2008-11-25 15:16:32 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -53,7 +53,7 @@ struct dir {
     int                d_flags;
 
     time_t      ctime;                /* inode ctime */
-    int         offcnt;               /* offspring count */
+    u_int32_t   offcnt;               /* offspring count */
 
     char       *d_m_name;            /* mac name */
     char        *d_u_name;            /* unix name */
@@ -63,16 +63,16 @@ struct path {
     int         m_type;             /* mac name type (long name, unicode */
     char       *m_name;            /* mac name */
     char        *u_name;            /* unix name */
-    struct dir  *dir;               /* */
+    struct dir  *d_dir;             /* */
     int         st_valid;           /* does st_errno and st set */
     int         st_errno;
     struct stat st;
 };
 
 #ifndef ATACC
-static __inline__ int path_isadir(struct path *o_path)
+static inline int path_isadir(struct path *o_path)
 {
-    return o_path->dir != NULL;
+    return o_path->d_dir != NULL;
 #if 0
     return o_path->m_name == '\0' || /* we are in a it */
            !o_path->st_valid ||      /* in cache but we can't chdir in it */ 
@@ -137,6 +137,7 @@ extern int path_isadir(struct path *o_path);
 #define DIRPBIT_GID    11
 #define DIRPBIT_ACCESS 12
 #define DIRPBIT_PDINFO  13         /* ProDOS Info */
+#define DIRPBIT_UNIXPR  15
 
 /* directory attribute bits (see file.h for other bits) */
 #define ATTRBIT_EXPFOLDER   (1 << 1) /* shared point */
@@ -153,6 +154,8 @@ extern int path_isadir(struct path *o_path);
 /* file/directory ids. what a mess. we scramble things in a vain attempt
  * to get something meaningful */
 #ifndef AFS
+
+#if 0
 #define CNID_XOR(a)  (((a) >> 16) ^ (a))
 #define CNID_DEV(a)   ((((CNID_XOR(major((a)->st_dev)) & 0xf) << 3) | \
        (CNID_XOR(minor((a)->st_dev)) & 0x7)) << 24)
@@ -160,6 +163,10 @@ extern int path_isadir(struct path *o_path);
                                       & 0x00ffffff)
 #define CNID_FILE(a)  (((a) & 0x1) << 31)
 #define CNID(a,b)     (CNID_DEV(a) | CNID_INODE(a) | CNID_FILE(b))
+#endif
+
+#define CNID(a,b)     ((a)->st_ino & 0xffffffff)
+
 #else /* AFS */
 #define CNID(a,b)     (((a)->st_ino & 0x7fffffff) | CNID_FILE(b))
 #endif /* AFS */
@@ -189,7 +196,7 @@ extern struct dir   *adddir __P((struct vol *, struct dir *,
 
 extern struct dir       *dirinsert __P((struct vol *, struct dir *));
 extern int              movecwd __P((const struct vol *, struct dir *));
-extern int              deletecurdir __P((const struct vol *, char *, int));
+extern int              deletecurdir __P((const struct vol *, char *));
 extern struct path      *cname __P((const struct vol *, struct dir *,
                              char **));
 extern mode_t           mtoumode __P((struct maccess *));
@@ -197,8 +204,8 @@ extern void             utommode __P((struct stat *, struct maccess *));
 extern int getdirparams __P((const struct vol *, u_int16_t, struct path *,
                                  struct dir *, char *, int *));
 extern int setdirparams __P((const struct vol *, struct path *, u_int16_t, char *));
-extern int renamedir __P((char *, char *, struct dir *,
-                              struct dir *, char *, const int));
+extern int renamedir __P((const struct vol *, char *, char *, struct dir *,
+                              struct dir *, char *));
 extern int path_error __P((struct path *, int error));
 
 typedef int (*dir_loop)(struct dirent *, char *, void *);
@@ -206,6 +213,7 @@ typedef int (*dir_loop)(struct dirent *, char *, void *);
 extern int  for_each_dirent __P((const struct vol *, char *, dir_loop , void *));
 
 extern int  check_access __P((char *name , int mode));
+extern int file_access   __P((struct path *path, int mode));
 
 extern int netatalk_unlink __P((const char *name));
 
@@ -224,6 +232,9 @@ extern int  afp_mapname __P((AFPObj *, char *, int, char *, int *));
 extern int     afp_enumerate __P((AFPObj *, char *, unsigned int, char *, unsigned int *));
 extern int     afp_enumerate_ext __P((AFPObj *, char *, unsigned int, char *, unsigned int *));
 extern int     afp_enumerate_ext2 __P((AFPObj *, char *, unsigned int, char *, unsigned int *));
+
+/* from catsearch.c */
 extern int     afp_catsearch __P((AFPObj *, char *, int, char *, int *));
+extern int     afp_catsearch_ext __P((AFPObj *, char *, int, char *, int *));
 
 #endif