Merge 2-2

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

diff --git a/etc/afpd/filedir.h b/etc/afpd/filedir.h
index a64c8fd9f162cb9bcceb1d1e691d231106a20116..02c9ac15b5382ed99c5ee4cf7a84166d4e85cfda 100644 (file)
--- a/etc/afpd/filedir.h
+++ b/etc/afpd/filedir.h
@@ -1,31 +1,26 @@
-/*
- * $Id: filedir.h,v 1.8 2002-08-29 18:57:26 didg Exp $
- */
-
 #ifndef AFPD_FILEDIR_H
 #define AFPD_FILEDIR_H 1
 
-#include <sys/cdefs.h>
 #include <sys/stat.h>
-#include "globals.h"
+#include <atalk/globals.h>
 #include "volume.h"
 
 extern struct afp_options default_options;
 
-extern char            *ctoupath __P((const struct vol *, struct dir *,
-                                char *));
-extern int             veto_file __P((const char *veto_str, const char *path));
-extern int             check_name __P((const struct vol *vol, char *name));
-extern int             check_access __P((char *name , int mode));
+extern char            *ctoupath (const struct vol *, struct dir *,
+                                char *);
+extern char            *absupath (const struct vol *, struct dir *,
+                                char *);
+extern int             veto_file (const char *veto_str, const char *path);
+extern int             check_name (const struct vol *vol, char *name);
+
+extern int matchfile2dirperms (char *, struct vol *, int);
 
 /* FP functions */
-extern int     matchfile2dirperms __P((char *, struct vol *, int));
-extern int     afp_moveandrename __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_rename __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_delete __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_getfildirparams __P((AFPObj *, char *, int, char *,
-                                        int *));
-extern int     afp_setfildirparams __P((AFPObj *, char *, int, char *,
-                                        int *));
+int afp_moveandrename (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_rename (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_delete (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_getfildirparams (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_setfildirparams (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
 
 #endif