Constify to remove a bunch of warnings. Add some casts to squelch

(presumably-)harmless-but-otherwise-unremovable const-to-nonconst
warnings.

In the TACACS dissector, clean up the variables used in option parsing
to avoid some const-to-nonconst warnings.

Clean up some white space.

svn path=/trunk/; revision=15043

8 files changed, 38 insertions, 37 deletions

diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 2947fa1b3d..fa04c4a8ba 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -58,7 +58,7 @@
 typedef struct _rpcstat_t {
 	GtkWidget *win;
 	srt_stat_table srt_table;
-	char *prog;
+	const char *prog;
 	e_uuid_t uuid;
 	guint16 ver;
 	int num_procedures;
@@ -193,8 +193,8 @@ gtk_dcerpcstat_init(char *optarg)
 	GtkWidget *vbox;
 	GtkWidget *stat_label;
 	GtkWidget *filter_label;
-    GtkWidget *bbox;
-    GtkWidget *close_bt;
+	GtkWidget *bbox;
+	GtkWidget *close_bt;
 	dcerpc_sub_dissector *procs;
 	e_uuid_t uuid;
 	guint d1,d2,d3,d40,d41,d42,d43,d44,d45,d46,d47;
@@ -295,7 +295,7 @@ gtk_dcerpcstat_init(char *optarg)
 
        	for(i=0;i<(max_procs+1);i++){
 		int j;
-		char *proc_name;
+		const char *proc_name;
 
 		proc_name="unknown";
 		for(j=0;procs[j].name;j++){
@@ -431,7 +431,7 @@ static GtkWidget *program_submenu_menu;
 static GtkWidget *program_submenu_item;
 static GtkWidget *program_submenu_label;
 static int program_subitem_index;
-static char *first_menu_name;
+static const char *first_menu_name;
 static void 
 dcerpcstat_add_program_to_menu(dcerpc_uuid_key *k, dcerpc_uuid_value *v)
 {
diff --git a/gtk/decode_as_dcerpc.h b/gtk/decode_as_dcerpc.h
index 92f130d7bf..6b1dcc26eb 100644
--- a/gtk/decode_as_dcerpc.h
+++ b/gtk/decode_as_dcerpc.h
@@ -97,10 +97,10 @@ decode_dcerpc_binding_free(void *binding);
 extern void
 decode_add_to_show_list (
 gpointer list_data, 
-gchar *table_name, 
+const gchar *table_name, 
 gchar *selector_name, 
-gchar *initial_proto_name, 
-gchar *current_proto_name);
+const gchar *initial_proto_name, 
+const gchar *current_proto_name);
 
 
 /*
@@ -124,7 +124,7 @@ gchar *current_proto_name);
  * to store any information generated by this routine.
  */
 extern void
-decode_add_to_list (gchar *table_name, gchar *proto_name, gpointer value, gpointer user_data);
+decode_add_to_list (gchar *table_name, const gchar *proto_name, gpointer value, gpointer user_data);
 
 /*
  * This routine starts the creation of a List on a notebook page.  It
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index 0c0347ab37..d874e89812 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -260,10 +260,10 @@ gpointer userdata)
 void
 decode_add_to_show_list (
 gpointer list_data, 
-gchar *table_name, 
+const gchar *table_name, 
 gchar *selector_name, 
-gchar *initial_proto_name, 
-gchar *current_proto_name)
+const gchar *initial_proto_name, 
+const gchar *current_proto_name)
 {
     gchar     *text[E_LIST_D_COLUMNS];
 #if GTK_MAJOR_VERSION < 2
@@ -280,10 +280,10 @@ gchar *current_proto_name)
     store = (GtkListStore *)list_data;
 #endif
 
-    text[E_LIST_D_TABLE] = table_name;
+    text[E_LIST_D_TABLE] = (char *)table_name;
     text[E_LIST_D_SELECTOR] = selector_name;
-    text[E_LIST_D_INITIAL] = initial_proto_name;
-    text[E_LIST_D_CURRENT] = current_proto_name;
+    text[E_LIST_D_INITIAL] = (char *)initial_proto_name;
+    text[E_LIST_D_CURRENT] = (char *)current_proto_name;
 #if GTK_MAJOR_VERSION < 2
     row = gtk_clist_prepend(clist, text);
 #else
@@ -320,8 +320,9 @@ decode_build_show_list (gchar *table_name, ftenum_t selector_type,
 			gpointer key, gpointer value, gpointer user_data)
 {
     dissector_handle_t current, initial;
-    gchar     *current_proto_name, *initial_proto_name, *selector_name;
-    gchar      string1[20];
+    const gchar *current_proto_name, *initial_proto_name;
+    gchar       *selector_name;
+    gchar        string1[20];
 
     g_assert(user_data);
     g_assert(value);
@@ -1229,7 +1230,7 @@ lookup_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
  * to store any information generated by this routine.
  */
 void
-decode_add_to_list (gchar *table_name, gchar *proto_name, gpointer value, gpointer user_data)
+decode_add_to_list (gchar *table_name, const gchar *proto_name, gpointer value, gpointer user_data)
 {
     gchar     *text[E_LIST_S_COLUMNS];
 #if GTK_MAJOR_VERSION < 2
@@ -1262,7 +1263,7 @@ decode_add_to_list (gchar *table_name, gchar *proto_name, gpointer value, gpoint
     if (hli.found) return;
 #endif
 
-    text[E_LIST_S_PROTO_NAME] = proto_name;
+    text[E_LIST_S_PROTO_NAME] = (char *)proto_name;
     text[E_LIST_S_TABLE] = table_name;
 #if GTK_MAJOR_VERSION < 2
     row = gtk_clist_prepend(list, text);
@@ -1279,7 +1280,7 @@ decode_add_to_list (gchar *table_name, gchar *proto_name, gpointer value, gpoint
 static void
 decode_proto_add_to_list (gchar *table_name, gpointer value, gpointer user_data)
 {
-    gchar     *proto_name;
+    const gchar     *proto_name;
     gint       i;
     dissector_handle_t handle;
 
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index 5cee70387b..a98dda5220 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -731,7 +731,7 @@ value_list_sel_cb(GtkTreeSelection *sel, gpointer value_entry_arg)
 }
 
 static void
-dfilter_report_bad_value(char *format, ...)
+dfilter_report_bad_value(const char *format, ...)
 {
 	char error_msg_buf[1024];
 	va_list args;
@@ -1396,7 +1396,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
 
     GtkTreeIter iter, child_iter;
     void *cookie, *cookie2;
-    gchar *name;
+    const gchar *name;
 
     for (i = proto_get_first_protocol(&cookie); i != -1;
 	 i = proto_get_next_protocol(&cookie)) {
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 6c42bfba18..6854008b03 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -985,7 +985,7 @@ pref_fetch(pref_t *pref, gpointer user_data)
     str_val = gtk_entry_get_text(GTK_ENTRY(pref->control));
     if (strcmp(*pref->varp.string, str_val) != 0) {
       *pref_changed_p = TRUE;
-      g_free(*pref->varp.string);
+      g_free((void *)*pref->varp.string);
       *pref->varp.string = g_strdup(str_val);
     }
     break;
@@ -1319,7 +1319,7 @@ pref_revert(pref_t *pref, gpointer user_data)
   case PREF_STRING:
     if (strcmp(*pref->varp.string, pref->saved_val.string) != 0) {
       *pref_changed_p = TRUE;
-      g_free(*pref->varp.string);
+      g_free((void *)*pref->varp.string);
       *pref->varp.string = g_strdup(pref->saved_val.string);
     }
     break;
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index 446eeeaf83..fae7399986 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -77,13 +77,13 @@ static GtkWidget *proto_w = NULL;
 static GSList *protocol_list = NULL;
 
 typedef struct protocol_data {
-  char     *name;
-  char 	   *abbrev;
-  int  	   hfinfo_index;
-  gboolean enabled;
-  gboolean was_enabled;
+  const char  *name;
+  const char  *abbrev;
+  int  	      hfinfo_index;
+  gboolean    enabled;
+  gboolean    was_enabled;
 #if GTK_MAJOR_VERSION < 2
-  gint     row;
+  gint        row;
 #else
   GtkTreeIter iter;
 #endif
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index cffc0db23a..28ecd7ab0a 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -55,7 +55,7 @@
 typedef struct _rpcstat_t {
 	GtkWidget *win;
 	srt_stat_table srt_table;
-	char *prog;
+	const char *prog;
 	guint32 program;
 	guint32 version;
 	guint32 num_procedures;
@@ -224,8 +224,8 @@ gtk_rpcstat_init(char *optarg)
 	GtkWidget *vbox;
 	GtkWidget *stat_label;
 	GtkWidget *filter_label;
-    GtkWidget *bbox;
-    GtkWidget *close_bt;
+	GtkWidget *bbox;
+	GtkWidget *close_bt;
 	int program, version, pos;
 	char *filter=NULL;
 	GString *error_string;
diff --git a/gtk/supported_protos_dlg.c b/gtk/supported_protos_dlg.c
index 53bc1486e0..a9978265c2 100644
--- a/gtk/supported_protos_dlg.c
+++ b/gtk/supported_protos_dlg.c
@@ -277,7 +277,7 @@ static void set_supported_text(GtkWidget *w, supported_type_t type)
   const char *type_name;
   void *cookie, *cookie2;
   protocol_t *protocol;
-  char *name, *short_name, *filter_name;
+  const char *name, *short_name, *filter_name;
   int namel = 0, short_namel = 0, filter_namel = 0;
   int count, fcount;
 
@@ -303,7 +303,7 @@ static void set_supported_text(GtkWidget *w, supported_type_t type)
     for (i = proto_get_first_protocol(&cookie); i != -1;
          i = proto_get_next_protocol(&cookie)) {
 	    count++;
-        protocol = find_protocol_by_id(i);
+	    protocol = find_protocol_by_id(i);
 	    name = proto_get_protocol_name(i);
 	    short_name = proto_get_protocol_short_name(protocol);
 	    filter_name = proto_get_protocol_filter_name(i);
@@ -328,7 +328,7 @@ static void set_supported_text(GtkWidget *w, supported_type_t type)
     /* ok, display the correctly aligned strings */
     for (i = proto_get_first_protocol(&cookie); i != -1;
          i = proto_get_next_protocol(&cookie)) {
-        protocol = find_protocol_by_id(i);
+	    protocol = find_protocol_by_id(i);
 	    name = proto_get_protocol_name(i);
 	    short_name = proto_get_protocol_short_name(protocol);
 	    filter_name = proto_get_protocol_filter_name(i);
@@ -391,7 +391,7 @@ static void set_supported_text(GtkWidget *w, supported_type_t type)
     fcount = 0;
     for (i = proto_get_first_protocol(&cookie); i != -1;
          i = proto_get_next_protocol(&cookie)) {
-        protocol = find_protocol_by_id(i);
+	    protocol = find_protocol_by_id(i);
 	    name = proto_get_protocol_name(i);
 	    short_name = proto_get_protocol_short_name(protocol);
 	    filter_name = proto_get_protocol_filter_name(i);