Merge master

[netatalk.git] / include / atalk / volume.h

diff --git a/include/atalk/volume.h b/include/atalk/volume.h
index af2b411c625ca6b07f8203798d5ccbcd12d36c10..82de0420c95260b87757a79566daa84ee7e7437a 100644 (file)
--- a/include/atalk/volume.h
+++ b/include/atalk/volume.h
@@ -9,7 +9,6 @@
 #include <stdint.h>
 #include <sys/cdefs.h>
 #include <sys/types.h>
-// #include <netatalk/endian.h>
 
 #include <atalk/unicode.h>
 #include <atalk/cnid.h>
@@ -23,7 +22,7 @@ typedef uint64_t VolSpace;
 
 struct vol {
     struct vol      *v_next;
-    u_int16_t       v_vid;
+    uint16_t        v_vid;
     int             v_flags;
     char            *v_path;
     struct dir      *v_root;
@@ -31,15 +30,15 @@ struct vol {
 
     charset_t       v_volcharset;
     charset_t       v_maccharset;
-    u_int16_t       v_mtou_flags;    /* flags for convert_charset in mtoupath */
-    u_int16_t       v_utom_flags;
+    uint16_t        v_mtou_flags;    /* flags for convert_charset in mtoupath */
+    uint16_t        v_utom_flags;
     long            v_kTextEncoding; /* mac charset encoding in network order
                                       * FIXME: should be a u_int32_t ? */
     size_t          max_filename;
     char            *v_veto;
     int             v_adouble;    /* adouble format: v1, v2, sfm ... */
     int             v_ad_options; /* adouble option NODEV, NOCACHE, etc.. */
-    char            *(*ad_path)(const char *, int);
+    const char      *(*ad_path)(const char *, int);
     struct _cnid_db *v_cdb;
     char            v_stamp[ADEDLEN_PRIVSYN];
     VolSpace        v_limitsize; /* Size limit, if any, in MiB */
@@ -88,10 +87,6 @@ struct vol {
     int             v_root_preexec_close;
     int             v_preexec_close;
     char            *v_uuid;    /* For TimeMachine zeroconf record */
-#ifdef FORCE_UIDGID
-    char            *v_forceuid;
-    char            *v_forcegid;
-#endif
 #ifdef __svr4__
     int         v_qfd;
 #endif /*__svr4__*/
@@ -120,7 +115,6 @@ struct vol {
 #define AFPVOL_USEDOTS   (1 << 11)  /* use real dots */
 #define AFPVOL_LIMITSIZE (1 << 12)  /* limit size for older macs */
 #define AFPVOL_MAPASCII  (1 << 13)  /* map the ascii range as well */
-#define AFPVOL_DROPBOX   (1 << 14)  /* dropkludge dropbox support */
 #define AFPVOL_NOFILEID  (1 << 15)  /* don't advertise createid resolveid and deleteid calls */
 #define AFPVOL_NOSTAT    (1 << 16)  /* advertise the volume even if we can't stat() it
                                      * maybe because it will be mounted later in preexec */