Constify a bunch of structure members and function arguments, to squelch

compiler warnings.

Clean up indentation.


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

6 files changed, 17 insertions, 16 deletions

diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index 154bd8fe97..5cee70387b 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -84,7 +84,7 @@ static void build_boolean_values(GtkWidget *value_list_scrolled_win,
 static void build_enum_values(GtkWidget *value_list_scrolled_win,
                               GtkWidget *value_list,
                               const value_string *values);
-static void add_value_list_item(GtkWidget *value_list, gchar *string,
+static void add_value_list_item(GtkWidget *value_list, const gchar *string,
                                 gpointer data);
 static void display_value_fields(header_field_info *hfinfo,
                                  gboolean is_comparison, GtkWidget *value_label,
@@ -503,7 +503,7 @@ build_enum_values(GtkWidget *value_list_scrolled_win _U_, GtkWidget *value_list,
 }
 
 static void
-add_value_list_item(GtkWidget *value_list, gchar *string, gpointer data)
+add_value_list_item(GtkWidget *value_list, const gchar *string, gpointer data)
 {
 #if GTK_MAJOR_VERSION < 2
     GtkWidget *label, *item;
diff --git a/gtk/http_stat.c b/gtk/http_stat.c
index 0defcfebe6..e7d7546c7d 100644
--- a/gtk/http_stat.c
+++ b/gtk/http_stat.c
@@ -70,7 +70,7 @@ typedef struct _http_stats_t {
 typedef struct _http_response_code_t {
 	guint32 	 packets;		/* 3 */
 	guint	 	 response_code;		/* 404 */
-	gchar		*name;			/* Not Found */
+	const gchar	*name;			/* Not Found */
 	GtkWidget	*widget;		/* Label where we display it */
 	GtkWidget	*table;			/* Table in which we put it, e.g. client_error_box */
 	httpstat_t	*sp;
diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c
index ec66036c25..862e258db7 100644
--- a/gtk/service_response_time_table.c
+++ b/gtk/service_response_time_table.c
@@ -328,7 +328,7 @@ srt_create_popup_menu(srt_stat_table *rst)
 
 
 void
-init_srt_table(srt_stat_table *rst, int num_procs, GtkWidget *vbox, char *filter_string)
+init_srt_table(srt_stat_table *rst, int num_procs, GtkWidget *vbox, const char *filter_string)
 {
 	int i, j;
 	column_arrows *col_arrows;
diff --git a/gtk/service_response_time_table.h b/gtk/service_response_time_table.h
index 108cd91a00..d2ac4c6426 100644
--- a/gtk/service_response_time_table.h
+++ b/gtk/service_response_time_table.h
@@ -58,7 +58,8 @@ typedef struct _srt_stat_table {
  * @param vbox the corresponding GtkVBox to fill in
  * @param filter_string filter string or NULL
  */
-void init_srt_table(srt_stat_table *rst, int num_procs, GtkWidget *vbox, char *filter_string);
+void init_srt_table(srt_stat_table *rst, int num_procs, GtkWidget *vbox,
+                    const char *filter_string);
 
 /** Init an srt table row data structure.
  *
diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c
index 1e1edffb6c..3f5dbc77d6 100644
--- a/gtk/sip_stat.c
+++ b/gtk/sip_stat.c
@@ -73,13 +73,13 @@ typedef struct _sip_stats_t {
  * for example it can be { 3, 404, "Not Found" ,...}
  * which means we captured 3 reply sip/1.1 404 Not Found */
 typedef struct _sip_response_code_t {
-    guint32 	 packets;		    /* 3 */
-    guint	 	 response_code;		/* 404 */
-    gchar		*name;			    /* "Not Found" */
-    GtkWidget	*widget;		    /* Label where we display it */
-    GtkWidget	*table;			    /* Table in which we put it,
-                                       e.g. client_error_table */
-    sipstat_t	*sp;                /* Pointer back to main struct */
+    guint32 	 packets;		/* 3 */
+    guint 	 response_code;		/* 404 */
+    const gchar	*name;			/* "Not Found" */
+    GtkWidget	*widget;		/* Label where we display it */
+    GtkWidget	*table;			/* Table in which we put it,
+					   e.g. client_error_table */
+    sipstat_t	*sp;			/* Pointer back to main struct */
 } sip_response_code_t;
 
 /* Used to keep track of the stats for a specific request string */
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index 755a17ec8c..e96056e5c1 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -65,7 +65,7 @@ typedef struct _wsp_stats_t {
 } wspstat_t;
 /* used to keep track of a single type of status code */
 typedef struct _wsp_status_code_t {
-	gchar		*name;
+	const gchar	*name;
 	guint32		 packets;
 	GtkWidget	*widget;/* label in which we print the number of packets */
 	wspstat_t	*sp;	/* entire program interface */
@@ -311,8 +311,8 @@ gtk_wspstat_init(char *optarg)
 	char 		*title=NULL;
 	GString		*error_string;
 	GtkWidget	*main_vb, *pdutypes_fr, *statuscode_fr ;
-    GtkWidget	*bt_close;
-    GtkWidget	*bbox;
+	GtkWidget	*bt_close;
+	GtkWidget	*bbox;
 	guint32		 i;
 	wsp_status_code_t *sc;
 	
@@ -355,7 +355,7 @@ gtk_wspstat_init(char *optarg)
 		sp->pdu_stats[i].packets=0;
 	}
 
-    gtk_window_set_title(GTK_WINDOW(sp->win), title);
+	gtk_window_set_title(GTK_WINDOW(sp->win), title);
 	g_free(title);
 
 	/* container for the two frames */