In GTK+ 2.x, "gtk_entry_get_text()" returns a "const gchar *"; assign

its value to pointer-to-const variables.

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

diff --git a/filters.c b/filters.c
index 07d72b03c578b7934e4e48c80eb1e2f83906daf7..aa58bcad4cd63725e19b71b9c5da9cf302b66994 100644 (file)
--- a/filters.c
+++ b/filters.c
@@ -1,7 +1,7 @@
 /* filters.c
  * Code for reading and writing the filters file.
  *
- * $Id: filters.c,v 1.15 2002/08/28 21:00:06 jmayer Exp $
+ * $Id: filters.c,v 1.16 2003/12/04 00:45:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -364,7 +364,8 @@ get_filter_list_first(filter_list_type_t list)
  * Returns a pointer to the newly-added entry.
  */
 GList *
-add_to_filter_list(filter_list_type_t list, char *name, char *expression)
+add_to_filter_list(filter_list_type_t list, const char *name,
+    const char *expression)
 {
   GList      **flp;
   filter_def *filt;

diff --git a/filters.h b/filters.h
index 5569d6226a6f78c83cdf175bd7d00725ba88e551..cbea1b9c566626bd46bb18ce0c2e06cfcb075979 100644 (file)
--- a/filters.h
+++ b/filters.h
@@ -1,7 +1,7 @@
 /* filters.c
  * Declarations of routines for reading and writing the filters file.
  *
- * $Id: filters.h,v 1.3 2002/08/28 21:00:06 jmayer Exp $
+ * $Id: filters.h,v 1.4 2003/12/04 00:45:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -59,8 +59,8 @@ GList *get_filter_list_first(filter_list_type_t list);
  * Add a new filter to the end of a list.
  * Returns a pointer to the newly-added entry.
  */
-GList *add_to_filter_list(filter_list_type_t list, char *name,
-    char *expression);
+GList *add_to_filter_list(filter_list_type_t list, const char *name,
+    const char *expression);
 
 /*
  * Remove a filter from a list.

diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index be0a6bc12ab656d1e0fd724264c70720b1c676b5..59e4d205266b794184380f62f3bb3695c51e868a 100644 (file)
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -1,7 +1,7 @@
 /* dcerpc_stat.c
  * dcerpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: dcerpc_stat.c,v 1.28 2003/11/10 07:44:47 sahlberg Exp $
+ * $Id: dcerpc_stat.c,v 1.29 2003/12/04 00:45:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -512,7 +512,7 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
        GtkWidget *vers_label;
        GtkWidget *filter_box, *filter_bt;
        GtkWidget *bbox, *start_button, *cancel_button;
-       char *filter;
+       const char *filter;
        static construct_args_t args = {
          "Service Response Time Statistics Filter",
          TRUE,

diff --git a/gtk/endpoint_talkers_table.c b/gtk/endpoint_talkers_table.c
index a47f08047c4abcb0b9936ef2da2195523f771677..76530d7143a280b2f4c8bddbf2fa812fb33b0bea 100644 (file)
--- a/gtk/endpoint_talkers_table.c
+++ b/gtk/endpoint_talkers_table.c
@@ -4,7 +4,7 @@
  * endpoint_talkers_table   2003 Ronnie Sahlberg
  * Helper routines common to all endpoint talkers tap.
  *
- * $Id: endpoint_talkers_table.c,v 1.23 2003/10/07 17:29:45 guy Exp $
+ * $Id: endpoint_talkers_table.c,v 1.24 2003/12/04 00:45:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -345,7 +345,7 @@ ett_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
        endpoints_table *et = (endpoints_table *)callback_data;
        char dirstr[128];
        char str[256];
-       char *current_filter;
+       const char *current_filter;
        char *sport, *dport;
 
        action=(callback_action>>16)&0xff;

diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index d57bed4afa44b916e184626e3a8753f60e0899a5..b4ca7f85c3f1f8fc3aeb8c61547d300633b6334a 100644 (file)
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -1,7 +1,7 @@
 /* fc_stat.c
  * fc_stat   2003 Ronnie Sahlberg
  *
- * $Id: fc_stat.c,v 1.13 2003/10/27 01:35:53 sharpe Exp $
+ * $Id: fc_stat.c,v 1.14 2003/12/04 00:45:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -227,7 +227,7 @@ gtk_fcstat_cb(GtkWidget *w _U_, gpointer d _U_)
        GtkWidget *dlg_box;
        GtkWidget *filter_box, *filter_bt;
        GtkWidget *bbox, *start_button, *cancel_button;
-       char *filter;
+       const char *filter;
        static construct_args_t args = {
          "Service Response Time Statistics Filter",
          TRUE,

diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c
index c447f94373c57915f6b020cb085c37e05d8df8ee..be06ceba75263bca8c32fd565ae94dfdabef9694 100644 (file)
--- a/gtk/filter_prefs.c
+++ b/gtk/filter_prefs.c
@@ -3,7 +3,7 @@
  * (This used to be a notebook page under "Preferences", hence the
  * "prefs" in the file name.)
  *
- * $Id: filter_prefs.c,v 1.45 2003/04/21 19:43:44 guy Exp $
+ * $Id: filter_prefs.c,v 1.46 2003/12/04 00:45:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1109,7 +1109,7 @@ filter_new_bt_clicked_cb(GtkWidget *w, gpointer data)
   GtkWidget  *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY);
   filter_list_type_t list = *(filter_list_type_t *)data;
   GList      *fl_entry;
-  gchar      *name, *strval;
+  const gchar *name, *strval;
   new_filter_cb_args_t args;
 
   name   = gtk_entry_get_text(GTK_ENTRY(name_te));

diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index a0cdf772c49afa24ace4db0704c3e8d239a4abf4..b87097802ebdf1b591ef54a998063864987a58ad 100644 (file)
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -1,7 +1,7 @@
 /* find_dlg.c
  * Routines for "find frame" window
  *
- * $Id: find_dlg.c,v 1.39 2003/11/28 19:01:43 ulfl Exp $
+ * $Id: find_dlg.c,v 1.40 2003/12/04 00:45:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -579,7 +579,7 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
 {
   GtkWidget       *filter_te, *backward_rb, *hex_rb, *ascii_rb, *combo_cb,
                   *case_cb, *decode_data_rb, *summary_data_rb;
-  gchar           *filter_text, *string_type;
+  const gchar     *filter_text, *string_type;
   search_charset_t scs_type = SCS_ASCII_AND_UNICODE;
   guint8          *bytes = NULL;
   size_t           nbytes;

diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c
index 18fd521746e0d52137b27a102948ec6f1d71f654..cf3d29894a538701affbecfeca5c5cff133fdead 100644 (file)
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.c
@@ -2,7 +2,7 @@
  * h225 message counter for ethereal
  * Copyright 2003 Lars Roland
  *
- * $Id: h225_counter.c,v 1.1 2003/10/28 00:31:17 guy Exp $
+ * $Id: h225_counter.c,v 1.2 2003/12/04 00:45:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -777,7 +777,7 @@ h225counter_start_button_clicked(GtkWidget *item _U_, gpointer data _U_)
 static void
 gtk_h225counter_cb(GtkWidget *w _U_, gpointer d _U_)
 {
-       char *filter;
+       const char *filter;
        char *title;
        GtkWidget *dlg_box;
        GtkWidget *filter_box, *filter_label;

diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c
index 80ef5034de2a557e76c4d9b92b400b42f5d3da0a..10c1735ef5e75bb2296c01903445b1c4db130d66 100644 (file)
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.c
@@ -2,7 +2,7 @@
  * h225 RAS Service Response Time statistics for ethereal
  * Copyright 2003 Lars Roland
  *
- * $Id: h225_ras_srt.c,v 1.1 2003/11/16 23:11:20 sahlberg Exp $
+ * $Id: h225_ras_srt.c,v 1.2 2003/12/04 00:45:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -339,7 +339,7 @@ h225rassrt_start_button_clicked(GtkWidget *item _U_, gpointer data _U_)
 static void
 gtk_h225rassrt_cb(GtkWidget *w _U_, gpointer d _U_)
 {
-       char *filter;
+       const char *filter;
        char *title;
        GtkWidget *dlg_box;
        GtkWidget *filter_box, *filter_label;

diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index ae56cbaef2ae47278c73c8b825f5b5fa8a036500..f2b22a44474793952b9d59e08e05b2640f02eb76 100644 (file)
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -1,7 +1,7 @@
 /* ldap_stat.c
  * ldap_stat   2003 Ronnie Sahlberg
  *
- * $Id: ldap_stat.c,v 1.1 2003/11/05 09:04:51 sahlberg Exp $
+ * $Id: ldap_stat.c,v 1.2 2003/12/04 00:45:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -262,7 +262,7 @@ gtk_ldapstat_cb(GtkWidget *w _U_, gpointer d _U_)
        GtkWidget *dlg_box;
        GtkWidget *filter_box, *filter_bt;
        GtkWidget *bbox, *start_button, *cancel_button;
-       char *filter;
+       const char *filter;
        static construct_args_t args = {
          "Service Response Time Statistics Filter",
          TRUE,

diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 7b16ff3cb7950199c8a7461db877c73bfd19b235..7693b214123cb0aa950fa6ec2fa33ba4e9b0992b 100644 (file)
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -2,7 +2,7 @@
  * mgcp-statistics for ethereal
  * Copyright 2003 Lars Roland
  *
- * $Id: mgcp_stat.c,v 1.17 2003/09/26 02:09:44 guy Exp $
+ * $Id: mgcp_stat.c,v 1.18 2003/12/04 00:45:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -343,7 +343,7 @@ mgcpstat_start_button_clicked(GtkWidget *item _U_, gpointer data _U_)
 static void
 gtk_mgcpstat_cb(GtkWidget *w _U_, gpointer d _U_)
 {
-       char *filter;
+       const char *filter;
        char *title;
        GtkWidget *dlg_box;
        GtkWidget *filter_box, *filter_label;

diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 5aa2017010d0f07caf726dbf4543bb03e8e76745..01e275726ed68f769c5353f581f2f3e13e3c4f14 100644 (file)
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
 /* prefs_dlg.c
  * Routines for handling preferences
  *
- * $Id: prefs_dlg.c,v 1.67 2003/12/03 09:28:25 guy Exp $
+ * $Id: prefs_dlg.c,v 1.68 2003/12/04 00:45:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -846,7 +846,7 @@ create_preference_entry(GtkWidget *main_tb, int table_position,
 static guint
 pref_fetch(pref_t *pref, gpointer user_data)
 {
-  char *str_val;
+  const char *str_val;
   char *p;
   guint uval;
   gboolean bval;

diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index cfe707c9f3e8acc55aa73cd02aed0ab0e2201ded..95a306997e5468d198b0e2af0bbf2f4a03f81699 100644 (file)
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -1,7 +1,7 @@
 /* rpc_stat.c
  * rpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: rpc_stat.c,v 1.24 2003/10/27 01:20:16 sharpe Exp $
+ * $Id: rpc_stat.c,v 1.25 2003/12/04 00:45:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -387,7 +387,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
        GtkWidget *filter_box, *filter_bt;
        GtkWidget *bbox, *start_button, *cancel_button;
        int i;
-       char *filter;
+       const char *filter;
        static construct_args_t args = {
          "Service Response Time Statistics Filter",
          TRUE,

diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c
index 74c2ac773938ba00ba08fbbf34d0070aecd405b0..42e5779e843001be71890788816ec8ed259df18e 100644 (file)
--- a/gtk/service_response_time_table.c
+++ b/gtk/service_response_time_table.c
@@ -3,7 +3,7 @@
  * Helper routines common to all service response time statistics
  * tap.
  *
- * $Id: service_response_time_table.c,v 1.10 2003/11/05 09:04:17 sahlberg Exp $
+ * $Id: service_response_time_table.c,v 1.11 2003/12/04 00:45:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -158,7 +158,7 @@ srt_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
        int action, type, selection;
        srt_stat_table *rst = (srt_stat_table *)callback_data;
        char str[256];
-       char *current_filter;
+       const char *current_filter;
 
 
        if(rst->filter_string==NULL){

diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index 2c20e5270da26f0ce0e477ad767b38e8f481fc4a..8806f4bc8e8352d12b5c2d8037bb18b17a5af59d 100644 (file)
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -1,7 +1,7 @@
 /* smb_stat.c
  * smb_stat   2003 Ronnie Sahlberg
  *
- * $Id: smb_stat.c,v 1.24 2003/10/27 01:20:16 sharpe Exp $
+ * $Id: smb_stat.c,v 1.25 2003/12/04 00:45:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -267,7 +267,7 @@ gtk_smbstat_cb(GtkWidget *w _U_, gpointer d _U_)
        GtkWidget *dlg_box;
        GtkWidget *filter_box, *filter_bt;
        GtkWidget *bbox, *start_button, *cancel_button;
-       char *filter;
+       const char *filter;
        static construct_args_t args = {
          "Service Response Time Statistics Filter",
          TRUE,