From b99199fcf8201f03d91fe754e8b6a3880f3abf3d Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Sat, 5 Jan 2013 03:42:28 +0000
Subject: [PATCH] Constify a couple of variables and export a couple of
 functions.

svn path=/trunk/; revision=46943
---
 epan/libwireshark.def | 2 ++
 epan/prefs.c          | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/epan/libwireshark.def b/epan/libwireshark.def
index e7742d2117..bd3951273a 100644
--- a/epan/libwireshark.def
+++ b/epan/libwireshark.def
@@ -738,6 +738,8 @@ prefs_module_has_submodules
 prefs_modules_foreach
 prefs_modules_foreach_submodules
 prefs_pref_foreach
+prefs_pref_is_default
+prefs_pref_to_str
 prefs_pref_type_description
 prefs_pref_type_name
 prefs_register_bool_preference
diff --git a/epan/prefs.c b/epan/prefs.c
index 2afb6886bd..508c8aff77 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -3969,7 +3969,7 @@ prefs_pref_type_name(pref_t *pref)
 char *
 prefs_pref_type_description(pref_t *pref)
 {
-    char *type_desc = "An unkown preference type";
+    const char *type_desc = "An unkown preference type";
 
     if (!pref) {
         return g_strdup_printf("%s.", type_desc); /* ...or maybe assert? */
@@ -4000,6 +4000,7 @@ prefs_pref_type_description(pref_t *pref)
 
     case PREF_ENUM:
     {
+        char *enum_desc;
         const enum_val_t *enum_valp = pref->info.enum_info.enumvals;
         GString *enum_str = g_string_new("One of: ");
         while (enum_valp->name != NULL) {
@@ -4009,9 +4010,9 @@ prefs_pref_type_description(pref_t *pref)
                 g_string_append(enum_str, ", ");
         }
         g_string_append(enum_str, "\n(case-insensitive).");
-        type_desc = enum_str->str;
+        enum_desc = enum_str->str;
         g_string_free(enum_str, FALSE);
-        return type_desc;
+        return enum_desc;
         break;
     }
 
@@ -4117,7 +4118,7 @@ prefs_pref_is_default(pref_t *pref) {
 
 char *
 prefs_pref_to_str(pref_t *pref, gboolean default_val) {
-    char *pref_text = "[Unknown]";
+    const char *pref_text = "[Unknown]";
     guint pref_uint;
     gboolean pref_boolval;
     gint pref_enumval;