Merge master

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

diff --git a/etc/afpd/volume.h b/etc/afpd/volume.h
index cc3dfdc9a8e5a4c0bc260758193df1b3a24ccb53..a0b45940a1397036370df7029d3800c803100d08 100644 (file)
--- a/etc/afpd/volume.h
+++ b/etc/afpd/volume.h
@@ -1,6 +1,4 @@
 /*
- * $Id: volume.h,v 1.34 2009-10-02 09:32:40 franklahm Exp $
- *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  */
@@ -8,9 +6,8 @@
 #ifndef AFPD_VOLUME_H
 #define AFPD_VOLUME_H 1
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
-#include <netatalk/endian.h>
+#include <arpa/inet.h>
 
 #include <atalk/volume.h>
 #include <atalk/cnid.h>
@@ -21,22 +18,26 @@
 #include "hash.h"
 #endif
 
-extern struct vol      *getvolbyvid __P((const u_int16_t));
-extern int              ustatfs_getvolspace __P((const struct vol *,
+extern struct vol       *getvolbyvid (const u_int16_t);
+extern int              ustatfs_getvolspace (const struct vol *,
             VolSpace *, VolSpace *,
-            u_int32_t *));
-extern void             setvoltime __P((AFPObj *, struct vol *));
-extern int              pollvoltime __P((AFPObj *));
-extern void             load_volumes __P((AFPObj *obj));
+            u_int32_t *);
+extern void             setvoltime (AFPObj *, struct vol *);
+extern int              pollvoltime (AFPObj *);
+extern void             load_volumes (AFPObj *obj);
+extern const struct vol *getvolumes(void);
+extern void             unload_volumes_and_extmap(void);
 
 /* FP functions */
-extern int     afp_openvol      __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_getvolparams __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_setvolparams __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_getsrvrparms __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_closevol     __P((AFPObj *, char *, int, char *, int *));
+int afp_openvol      (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_getvolparams (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_setvolparams (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_getsrvrparms (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int afp_closevol     (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
 
 /* netatalk functions */
-extern void     close_all_vol   __P((void));
+extern void     close_all_vol   (void);
+
+struct vol *current_vol;        /* last volume from getvolbyvid() */
 
 #endif