forked from osmocom/wireshark
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
This commit is contained in:
parent
a9b11add95
commit
25696883ad
|
@ -1,7 +1,7 @@
|
||||||
/* filters.c
|
/* filters.c
|
||||||
* Code for reading and writing the filters file.
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* 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.
|
* Returns a pointer to the newly-added entry.
|
||||||
*/
|
*/
|
||||||
GList *
|
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;
|
GList **flp;
|
||||||
filter_def *filt;
|
filter_def *filt;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* filters.c
|
/* filters.c
|
||||||
* Declarations of routines for reading and writing the filters file.
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@zing.org>
|
* 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.
|
* Add a new filter to the end of a list.
|
||||||
* Returns a pointer to the newly-added entry.
|
* Returns a pointer to the newly-added entry.
|
||||||
*/
|
*/
|
||||||
GList *add_to_filter_list(filter_list_type_t list, char *name,
|
GList *add_to_filter_list(filter_list_type_t list, const char *name,
|
||||||
char *expression);
|
const char *expression);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Remove a filter from a list.
|
* Remove a filter from a list.
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* dcerpc_stat.c
|
/* dcerpc_stat.c
|
||||||
* dcerpc_stat 2002 Ronnie Sahlberg
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* By Gerald Combs <gerald@ethereal.com>
|
||||||
|
@ -512,7 +512,7 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||||
GtkWidget *vers_label;
|
GtkWidget *vers_label;
|
||||||
GtkWidget *filter_box, *filter_bt;
|
GtkWidget *filter_box, *filter_bt;
|
||||||
GtkWidget *bbox, *start_button, *cancel_button;
|
GtkWidget *bbox, *start_button, *cancel_button;
|
||||||
char *filter;
|
const char *filter;
|
||||||
static construct_args_t args = {
|
static construct_args_t args = {
|
||||||
"Service Response Time Statistics Filter",
|
"Service Response Time Statistics Filter",
|
||||||
TRUE,
|
TRUE,
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
* endpoint_talkers_table 2003 Ronnie Sahlberg
|
* endpoint_talkers_table 2003 Ronnie Sahlberg
|
||||||
* Helper routines common to all endpoint talkers tap.
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* 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;
|
endpoints_table *et = (endpoints_table *)callback_data;
|
||||||
char dirstr[128];
|
char dirstr[128];
|
||||||
char str[256];
|
char str[256];
|
||||||
char *current_filter;
|
const char *current_filter;
|
||||||
char *sport, *dport;
|
char *sport, *dport;
|
||||||
|
|
||||||
action=(callback_action>>16)&0xff;
|
action=(callback_action>>16)&0xff;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* fc_stat.c
|
/* fc_stat.c
|
||||||
* fc_stat 2003 Ronnie Sahlberg
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* By Gerald Combs <gerald@ethereal.com>
|
||||||
|
@ -227,7 +227,7 @@ gtk_fcstat_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||||
GtkWidget *dlg_box;
|
GtkWidget *dlg_box;
|
||||||
GtkWidget *filter_box, *filter_bt;
|
GtkWidget *filter_box, *filter_bt;
|
||||||
GtkWidget *bbox, *start_button, *cancel_button;
|
GtkWidget *bbox, *start_button, *cancel_button;
|
||||||
char *filter;
|
const char *filter;
|
||||||
static construct_args_t args = {
|
static construct_args_t args = {
|
||||||
"Service Response Time Statistics Filter",
|
"Service Response Time Statistics Filter",
|
||||||
TRUE,
|
TRUE,
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* (This used to be a notebook page under "Preferences", hence the
|
* (This used to be a notebook page under "Preferences", hence the
|
||||||
* "prefs" in the file name.)
|
* "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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* 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);
|
GtkWidget *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY);
|
||||||
filter_list_type_t list = *(filter_list_type_t *)data;
|
filter_list_type_t list = *(filter_list_type_t *)data;
|
||||||
GList *fl_entry;
|
GList *fl_entry;
|
||||||
gchar *name, *strval;
|
const gchar *name, *strval;
|
||||||
new_filter_cb_args_t args;
|
new_filter_cb_args_t args;
|
||||||
|
|
||||||
name = gtk_entry_get_text(GTK_ENTRY(name_te));
|
name = gtk_entry_get_text(GTK_ENTRY(name_te));
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* find_dlg.c
|
/* find_dlg.c
|
||||||
* Routines for "find frame" window
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* 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,
|
GtkWidget *filter_te, *backward_rb, *hex_rb, *ascii_rb, *combo_cb,
|
||||||
*case_cb, *decode_data_rb, *summary_data_rb;
|
*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;
|
search_charset_t scs_type = SCS_ASCII_AND_UNICODE;
|
||||||
guint8 *bytes = NULL;
|
guint8 *bytes = NULL;
|
||||||
size_t nbytes;
|
size_t nbytes;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* h225 message counter for ethereal
|
* h225 message counter for ethereal
|
||||||
* Copyright 2003 Lars Roland
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* By Gerald Combs <gerald@ethereal.com>
|
||||||
|
@ -777,7 +777,7 @@ h225counter_start_button_clicked(GtkWidget *item _U_, gpointer data _U_)
|
||||||
static void
|
static void
|
||||||
gtk_h225counter_cb(GtkWidget *w _U_, gpointer d _U_)
|
gtk_h225counter_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||||
{
|
{
|
||||||
char *filter;
|
const char *filter;
|
||||||
char *title;
|
char *title;
|
||||||
GtkWidget *dlg_box;
|
GtkWidget *dlg_box;
|
||||||
GtkWidget *filter_box, *filter_label;
|
GtkWidget *filter_box, *filter_label;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* h225 RAS Service Response Time statistics for ethereal
|
* h225 RAS Service Response Time statistics for ethereal
|
||||||
* Copyright 2003 Lars Roland
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* By Gerald Combs <gerald@ethereal.com>
|
||||||
|
@ -339,7 +339,7 @@ h225rassrt_start_button_clicked(GtkWidget *item _U_, gpointer data _U_)
|
||||||
static void
|
static void
|
||||||
gtk_h225rassrt_cb(GtkWidget *w _U_, gpointer d _U_)
|
gtk_h225rassrt_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||||
{
|
{
|
||||||
char *filter;
|
const char *filter;
|
||||||
char *title;
|
char *title;
|
||||||
GtkWidget *dlg_box;
|
GtkWidget *dlg_box;
|
||||||
GtkWidget *filter_box, *filter_label;
|
GtkWidget *filter_box, *filter_label;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* ldap_stat.c
|
/* ldap_stat.c
|
||||||
* ldap_stat 2003 Ronnie Sahlberg
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* By Gerald Combs <gerald@ethereal.com>
|
||||||
|
@ -262,7 +262,7 @@ gtk_ldapstat_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||||
GtkWidget *dlg_box;
|
GtkWidget *dlg_box;
|
||||||
GtkWidget *filter_box, *filter_bt;
|
GtkWidget *filter_box, *filter_bt;
|
||||||
GtkWidget *bbox, *start_button, *cancel_button;
|
GtkWidget *bbox, *start_button, *cancel_button;
|
||||||
char *filter;
|
const char *filter;
|
||||||
static construct_args_t args = {
|
static construct_args_t args = {
|
||||||
"Service Response Time Statistics Filter",
|
"Service Response Time Statistics Filter",
|
||||||
TRUE,
|
TRUE,
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* mgcp-statistics for ethereal
|
* mgcp-statistics for ethereal
|
||||||
* Copyright 2003 Lars Roland
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* By Gerald Combs <gerald@ethereal.com>
|
||||||
|
@ -343,7 +343,7 @@ mgcpstat_start_button_clicked(GtkWidget *item _U_, gpointer data _U_)
|
||||||
static void
|
static void
|
||||||
gtk_mgcpstat_cb(GtkWidget *w _U_, gpointer d _U_)
|
gtk_mgcpstat_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||||
{
|
{
|
||||||
char *filter;
|
const char *filter;
|
||||||
char *title;
|
char *title;
|
||||||
GtkWidget *dlg_box;
|
GtkWidget *dlg_box;
|
||||||
GtkWidget *filter_box, *filter_label;
|
GtkWidget *filter_box, *filter_label;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* prefs_dlg.c
|
/* prefs_dlg.c
|
||||||
* Routines for handling preferences
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* By Gerald Combs <gerald@ethereal.com>
|
||||||
|
@ -846,7 +846,7 @@ create_preference_entry(GtkWidget *main_tb, int table_position,
|
||||||
static guint
|
static guint
|
||||||
pref_fetch(pref_t *pref, gpointer user_data)
|
pref_fetch(pref_t *pref, gpointer user_data)
|
||||||
{
|
{
|
||||||
char *str_val;
|
const char *str_val;
|
||||||
char *p;
|
char *p;
|
||||||
guint uval;
|
guint uval;
|
||||||
gboolean bval;
|
gboolean bval;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* rpc_stat.c
|
/* rpc_stat.c
|
||||||
* rpc_stat 2002 Ronnie Sahlberg
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* 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 *filter_box, *filter_bt;
|
||||||
GtkWidget *bbox, *start_button, *cancel_button;
|
GtkWidget *bbox, *start_button, *cancel_button;
|
||||||
int i;
|
int i;
|
||||||
char *filter;
|
const char *filter;
|
||||||
static construct_args_t args = {
|
static construct_args_t args = {
|
||||||
"Service Response Time Statistics Filter",
|
"Service Response Time Statistics Filter",
|
||||||
TRUE,
|
TRUE,
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* Helper routines common to all service response time statistics
|
* Helper routines common to all service response time statistics
|
||||||
* tap.
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* 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;
|
int action, type, selection;
|
||||||
srt_stat_table *rst = (srt_stat_table *)callback_data;
|
srt_stat_table *rst = (srt_stat_table *)callback_data;
|
||||||
char str[256];
|
char str[256];
|
||||||
char *current_filter;
|
const char *current_filter;
|
||||||
|
|
||||||
|
|
||||||
if(rst->filter_string==NULL){
|
if(rst->filter_string==NULL){
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* smb_stat.c
|
/* smb_stat.c
|
||||||
* smb_stat 2003 Ronnie Sahlberg
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* By Gerald Combs <gerald@ethereal.com>
|
||||||
|
@ -267,7 +267,7 @@ gtk_smbstat_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||||
GtkWidget *dlg_box;
|
GtkWidget *dlg_box;
|
||||||
GtkWidget *filter_box, *filter_bt;
|
GtkWidget *filter_box, *filter_bt;
|
||||||
GtkWidget *bbox, *start_button, *cancel_button;
|
GtkWidget *bbox, *start_button, *cancel_button;
|
||||||
char *filter;
|
const char *filter;
|
||||||
static construct_args_t args = {
|
static construct_args_t args = {
|
||||||
"Service Response Time Statistics Filter",
|
"Service Response Time Statistics Filter",
|
||||||
TRUE,
|
TRUE,
|
||||||
|
|
Loading…
Reference in New Issue