Remove obsolete options

[netatalk.git] / libatalk / util / volinfo.c

diff --git a/libatalk/util/volinfo.c b/libatalk/util/volinfo.c
index 52360b1ece0330089386c5383f9cc619c74403e3..1e7bad4697db4fcf1daa5dd88e5b9cb350932cd9 100644 (file)
--- a/libatalk/util/volinfo.c
+++ b/libatalk/util/volinfo.c
@@ -42,23 +42,15 @@
 #endif /* CNID_DB*/
 
 static const vol_opt_name_t vol_opt_names[] = {
-    {AFPVOL_A2VOL,      "PRODOS"},      /* prodos volume */
-    {AFPVOL_CRLF,       "CRLF"},        /* cr/lf translation */
-    {AFPVOL_NOADOUBLE,  "NOADOUBLE"},   /* don't create .AppleDouble by default */
     {AFPVOL_RO,         "READONLY"},    /* read-only volume */
-    {AFPVOL_MSWINDOWS,  "MSWINDOWS"},   /* deal with ms-windows yuckiness. this is going away. */
     {AFPVOL_NOHEX,      "NOHEX"},       /* don't do :hex translation */
     {AFPVOL_USEDOTS,    "USEDOTS"},     /* use real dots */
-    {AFPVOL_LIMITSIZE,  "LIMITSIZE"},   /* limit size for older macs */
-    {AFPVOL_MAPASCII,   "MAPASCII"},    /* map the ascii range as well */
-    {AFPVOL_NOFILEID,   "NOFILEID"},    /* don't advertise createid resolveid and deleteid calls */
     {AFPVOL_NOSTAT,     "NOSTAT"},      /* advertise the volume even if we can't stat() it
                                          * maybe because it will be mounted later in preexec */
     {AFPVOL_UNIX_PRIV,  "UNIXPRIV"},    /* support unix privileges */
     {AFPVOL_NODEV,      "NODEV"},       /* always use 0 for device number in cnid calls */
     {AFPVOL_CASEINSEN,  "CASEINSENSITIVE"}, /* volume is case insensitive */
     {AFPVOL_EILSEQ,     "ILLEGALSEQ"},  /* encode illegal sequence */
-    {AFPVOL_CACHE,      "CACHEID"},     /* Use adouble v2 CNID caching, default don't use it */
     {AFPVOL_INV_DOTS,   "INVISIBLEDOTS"}, 
     {AFPVOL_ACLS,       "ACLS"},        /* Vol supports ACLs */
     {AFPVOL_TM,         "TM"},          /* Set "kSupportsTMLockSteal" is volume attributes */
@@ -394,8 +386,6 @@ int loadvolinfo (char *path, struct volinfo *vol)
     vol->v_ad_options = 0;
     if ((vol->v_flags & AFPVOL_NODEV))
         vol->v_ad_options |= ADVOL_NODEV;
-    if ((vol->v_flags & AFPVOL_CACHE))
-        vol->v_ad_options |= ADVOL_CACHE;
     if ((vol->v_flags & AFPVOL_UNIX_PRIV))
         vol->v_ad_options |= ADVOL_UNIXPRIV;
     if ((vol->v_flags & AFPVOL_INV_DOTS))