Merge master

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

diff --git a/etc/afpd/volume.h b/etc/afpd/volume.h
index 883b1d56729a526bfe84ed48395a7b843a44de01..0a9f0f01fedba48e3e23fdc8566bee32c67e281f 100644 (file)
--- a/etc/afpd/volume.h
+++ b/etc/afpd/volume.h
@@ -12,27 +12,18 @@
 #include <atalk/volume.h>
 #include <atalk/cnid.h>
 #include <atalk/unicode.h>
+#include <atalk/globals.h>
 
-#include "globals.h"
-#if 0
-#include "hash.h"
-#endif
-
-extern struct vol       *getvolbyvid (const u_int16_t);
+extern struct vol       *getvolbyvid (const uint16_t);
 extern int              ustatfs_getvolspace (const struct vol *,
             VolSpace *, VolSpace *,
-            u_int32_t *);
+            uint32_t *);
 extern void             setvoltime (AFPObj *, struct vol *);
 extern int              pollvoltime (AFPObj *);
 extern void             load_volumes (AFPObj *obj);
-extern int              readvolfile(AFPObj *obj,
-                                    struct afp_volume_name *p1,
-                                    char *p2,
-                                    int user,
-                                    struct passwd *pwent);
 extern const struct vol *getvolumes(void);
 extern void             unload_volumes_and_extmap(void);
-extern char             *get_uuid(const AFPObj *obj, const char *volname);
+extern void             vol_fce_tm_event(void);
 
 /* FP functions */
 int afp_openvol      (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);