find_val_for_string() is only used in prefs.c so remove the prototype

and make it static.

When reading enum preferences, use the current value of the preference as the
default value of the preference instead of a hard-coded 1.  This way if we
couldn't find the appropriate value we'll don't end up changing the preference
to something that may or may not make sense.

svn path=/trunk/; revision=32950

1 files changed, 1 insertions, 5 deletions

diff --git a/epan/prefs-int.h b/epan/prefs-int.h
index 7d3d28fd9c..3769dce666 100644
--- a/epan/prefs-int.h
+++ b/epan/prefs-int.h
@@ -42,7 +42,7 @@ struct pref_module {
 };
 
 /*
- * Module used for protocol preferences. 
+ * Module used for protocol preferences.
  * With MSVC and a libwireshark.dll, we need a special declaration.
  */
 WS_VAR_IMPORT module_t *protocols_module;
@@ -97,10 +97,6 @@ struct preference {
 	void	*control;	/* handle for GUI control for this preference */
 };
 
-gint find_val_for_string(const char *needle, const enum_val_t *haystack,
-    gint default_value);
-
-
 /* read_prefs_file: read in a generic config file and do a callback to */
 /* pref_set_pair_fct() for every key/value pair found */
 typedef prefs_set_pref_e (*pref_set_pair_cb) (gchar *key, gchar *value, void *private_data);