Rename the preference values to something that leaves out the "eth" (as

it's redundant).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25720 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c
index 3e7f4fe684f146667599867ce2d742096bd93ec6..5ceeb52b682e30d98ec5dd56f562b60439592605 100644 (file)
--- a/epan/dissectors/packet-erf.c
+++ b/epan/dissectors/packet-erf.c
@@ -906,9 +906,9 @@ proto_register_erf(void)
   };
 
   static enum_val_t erf_ethfcs_options[] = { 
-    { "ethfcs",   "Present",          ERF_ETHFCS_YES },
-    { "ethnofcs", "Not present",      ERF_ETHFCS_NO },
-    { "eth",      "Possibly present", ERF_ETHFCS_MAYBE },
+    { "fcs",      "Present",          ERF_ETHFCS_YES },
+    { "nofcs",    "Not present",      ERF_ETHFCS_NO },
+    { "maybefcs", "Possibly present", ERF_ETHFCS_MAYBE },
     { NULL, NULL, 0 }
   };
 

diff --git a/epan/prefs.c b/epan/prefs.c
index 5a896963b4be47b2cb455246f6c5e73bf158e993..26b5afced651bad6ce1807109934d80a41fdd0d1 100644 (file)
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -2342,10 +2342,12 @@ set_pref(gchar *pref_name, gchar *value, void *private_data _U_)
            the new preference. */
         if (strcmp(dotp, "erfeth") == 0) {
           pref = find_preference(module, "ethfcs");
-          if (strcmp(value, "eth") == 0)
-            value = "ethnofcs";
+          if (strcmp(value, "ethfcs") == 0)
+            value = "fcs";
+          else if (strcmp(value, "eth") == 0)
+            value = "nofcs";
           else if (strcmp(value, "raw") == 0)
-            value = "eth";
+            value = "maybefcs";
         }
       }
     }