Merge master

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

diff --git a/etc/afpd/filedir.h b/etc/afpd/filedir.h
index bd4da87d3c223b98010c6caae1f0c62dba131019..02c9ac15b5382ed99c5ee4cf7a84166d4e85cfda 100644 (file)
--- a/etc/afpd/filedir.h
+++ b/etc/afpd/filedir.h
@@ -1,13 +1,8 @@
-/*
- * $Id: filedir.h,v 1.10 2009-10-13 22:55:37 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;
@@ -19,14 +14,13 @@ extern char         *absupath (const struct vol *, struct dir *,
 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 (char *, struct vol *, int);
-extern int     afp_moveandrename (AFPObj *, char *, int, char *, int *);
-extern int     afp_rename (AFPObj *, char *, int, char *, int *);
-extern int     afp_delete (AFPObj *, char *, int, char *, int *);
-extern int     afp_getfildirparams (AFPObj *, char *, int, char *,
-                                        int *);
-extern int     afp_setfildirparams (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