Merge master

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

diff --git a/include/atalk/volinfo.h b/include/atalk/volinfo.h
index 5c7a59974b357663d356dadd856f42c96537cb89..51bf30fc90a3a908dbdce8973a40ff86a424a830 100644 (file)
--- a/include/atalk/volinfo.h
+++ b/include/atalk/volinfo.h
@@ -1,7 +1,3 @@
-/*
- * $Id: volinfo.h,v 1.9 2009-12-01 16:36:14 franklahm Exp $
- */
-
 #ifndef _ATALK_VOLINFO_H
 #define _ATALK_VOLINFO_H 1
 
@@ -13,11 +9,14 @@
 #define VOLINFOFILE ".volinfo"
 
 typedef struct {
-    const u_int32_t option;
+    const uint32_t option;
     const char      *name;
 } vol_opt_name_t;
 
 struct volinfo {
+    int                 retaincount;
+    int                 malloced;
+
     char                *v_name;
     char                *v_path;
     int                 v_flags;
@@ -30,15 +29,16 @@ struct volinfo {
     charset_t           v_maccharset;
     int                 v_adouble;  /* default adouble format */
     int                 v_ad_options;
-    char                *(*ad_path)(const char *, int);
+    int                 v_vfs_ea;
+    const char          *(*ad_path)(const char *, int);
     char                *v_dbd_host;
-    int                 v_dbd_port;
+    char                *v_dbd_port;
 };
 
-extern const vol_opt_name_t vol_opt_names[];
-extern const vol_opt_name_t vol_opt_casefold[];
-
+struct volinfo *allocvolinfo(char *path);
 extern int loadvolinfo(char *path, struct volinfo *vol);
+extern void retainvolinfo(struct volinfo *vol);
+extern int closevolinfo(struct volinfo *vol);
 extern int savevolinfo(const struct vol *vol, const char *Cnid_srv, const char *Cnid_port);
 extern int vol_load_charsets(struct volinfo *vol);