Merge branch-2-1

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

diff --git a/etc/afpd/volume.h b/etc/afpd/volume.h
index 1cb43993a65c395f35e0571ea03e0868490fd446..fd2d22514ff086d42daaf6eae389a0b3cf970e95 100644 (file)
--- a/etc/afpd/volume.h
+++ b/etc/afpd/volume.h
@@ -1,6 +1,4 @@
 /*
- * $Id: volume.h,v 1.35 2009-10-13 22:55:37 didg Exp $
- *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  */
@@ -21,22 +19,26 @@
 #include "hash.h"
 #endif
 
-extern struct vol      *getvolbyvid (const u_int16_t);
+extern struct vol       *getvolbyvid (const u_int16_t);
 extern int              ustatfs_getvolspace (const struct vol *,
             VolSpace *, VolSpace *,
             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      (AFPObj *, char *, int, char *, int *);
-extern int     afp_getvolparams (AFPObj *, char *, int, char *, int *);
-extern int     afp_setvolparams (AFPObj *, char *, int, char *, int *);
-extern int     afp_getsrvrparms (AFPObj *, char *, int, char *, int *);
-extern int     afp_closevol     (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   (void);
 
+struct vol *current_vol;        /* last volume from getvolbyvid() */
+
 #endif