From cdd28bc87faafa33015551cf4c75cf1556ff5eed Mon Sep 17 00:00:00 2001 From: wmeier Date: Fri, 29 Jan 2010 16:13:26 +0000 Subject: [PATCH] Fix various gcc -Wshadow warnings. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31730 f5534014-38df-0310-8fa8-9805f1628bb7 --- gtk/capture_file_dlg.c | 8 +++--- gtk/capture_if_dlg.c | 18 ++++++------- gtk/color_dlg.c | 6 ++--- gtk/color_edit_dlg.c | 2 +- gtk/color_edit_dlg.h | 2 +- gtk/conversations_table.c | 56 ++++++++++++++++++--------------------- gtk/decode_as_dlg.c | 6 ++--- gtk/follow_ssl.c | 6 ++--- gtk/follow_stream.c | 22 +++++++-------- gtk/follow_tcp.c | 6 ++--- gtk/follow_udp.c | 6 ++--- gtk/main.c | 32 +++++++++++----------- gtk/menus.c | 10 +++---- 13 files changed, 88 insertions(+), 92 deletions(-) diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c index 8a8f93434c..1a57f502d4 100644 --- a/gtk/capture_file_dlg.c +++ b/gtk/capture_file_dlg.c @@ -1105,7 +1105,7 @@ set_file_type_list(GtkWidget *option_menu) { GtkWidget *ft_menu, *ft_menu_item; int ft; - guint index; + guint idx; gint item_to_select; /* Default to the first supported file type, if the file's current @@ -1115,20 +1115,20 @@ set_file_type_list(GtkWidget *option_menu) ft_menu = gtk_menu_new(); /* Check all file types. */ - index = 0; + idx = 0; for (ft = 0; ft < WTAP_NUM_FILE_TYPES; ft++) { if (can_save_with_wiretap(ft)) { /* OK, we can write it out in this type. */ ft_menu_item = gtk_menu_item_new_with_label(wtap_file_type_string(ft)); if (ft == filetype) { /* Default to the same format as the file, if it's supported. */ - item_to_select = index; + item_to_select = idx; } g_signal_connect(ft_menu_item, "activate", G_CALLBACK(select_file_type_cb), GINT_TO_POINTER(ft)); gtk_menu_shell_append(GTK_MENU_SHELL(ft_menu), ft_menu_item); gtk_widget_show(ft_menu_item); - index++; + idx++; } } diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c index 1243819049..ef3b676afa 100644 --- a/gtk/capture_if_dlg.c +++ b/gtk/capture_if_dlg.c @@ -102,13 +102,13 @@ */ static GtkWidget *cap_if_w; -GList *if_data = NULL; +static GList *if_data_list = NULL; -guint timer_id; +static guint timer_id; -GtkWidget *stop_bt; +static GtkWidget *stop_bt; -GList *if_list; +static GList *if_list; /* * Timeout, in milliseconds, for reads from the stream of captured packets. @@ -245,7 +245,7 @@ update_all(gpointer data) return FALSE; } - for(ifs = 0; (curr = g_list_nth(if_data, ifs)); ifs++) { + for(ifs = 0; (curr = g_list_nth(if_data_list, ifs)); ifs++) { update_if(curr->data, sc); } @@ -266,7 +266,7 @@ set_capture_if_dialog_for_capture_in_progress(gboolean capture_in_progress) if(cap_if_w) { gtk_widget_set_sensitive(stop_bt, capture_in_progress); - for(ifs = 0; (curr = g_list_nth(if_data, ifs)); ifs++) { + for(ifs = 0; (curr = g_list_nth(if_data_list, ifs)); ifs++) { if_dlg_data_t *if_dlg_data = curr->data; gtk_widget_set_sensitive(if_dlg_data->capture_bt, !capture_in_progress); @@ -286,11 +286,11 @@ capture_if_destroy_cb(GtkWidget *win _U_, gpointer user_data) g_source_remove(timer_id); - for(ifs = 0; (curr = g_list_nth(if_data, ifs)); ifs++) { + for(ifs = 0; (curr = g_list_nth(if_data_list, ifs)); ifs++) { g_free(curr->data); } - if_data = NULL; + if_data_list = NULL; free_interface_list(if_list); @@ -791,7 +791,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_) } #endif - if_data = g_list_append(if_data, if_dlg_data); + if_data_list = g_list_append(if_data_list, if_dlg_data); row++; if (row <= 10) { diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c index 6bb0fd45a1..957a88ea35 100644 --- a/gtk/color_dlg.c +++ b/gtk/color_dlg.c @@ -866,7 +866,7 @@ color_disable_cb(GtkWidget *widget, gboolean action_disable) /* Delete a single color filter from the list and elsewhere. */ void -color_delete(gint row, GtkWidget *color_filters) +color_delete_single(gint row, GtkWidget *color_filters) { color_filter_t *colorf; @@ -918,7 +918,7 @@ color_delete_cb(GtkWidget *widget, gpointer user_data _U_) { gtk_tree_model_iter_nth_child(model, &iter, NULL, row); if (gtk_tree_selection_iter_is_selected(sel, &iter)) - color_delete (row, color_filters); + color_delete_single (row, color_filters); } } @@ -959,7 +959,7 @@ color_clear_cmd(GtkWidget *widget) while (num_of_filters > 0) { - color_delete (num_of_filters-1, color_filters); + color_delete_single (num_of_filters-1, color_filters); } /* try to read the global filters */ diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c index 3ebf512e13..9bed644be5 100644 --- a/gtk/color_edit_dlg.c +++ b/gtk/color_edit_dlg.c @@ -437,7 +437,7 @@ static void edit_new_color_filter_cancel_cb(GtkButton *button, gpointer user_data _U_) { /* Delete the entry. As a side effect this destroys the edit_dialog window. */ - color_delete(num_of_filters-1, (GtkWidget*)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL)); + color_delete_single(num_of_filters-1, (GtkWidget*)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL)); } static GtkWidget* diff --git a/gtk/color_edit_dlg.h b/gtk/color_edit_dlg.h index 9f633f5251..d2e85c8bfd 100644 --- a/gtk/color_edit_dlg.h +++ b/gtk/color_edit_dlg.h @@ -40,6 +40,6 @@ edit_color_filter_dialog(GtkWidget *color_filters, /* edit dialog wants to destroy itself */ extern void -color_delete(gint row, GtkWidget *color_filters); +color_delete_single(gint row, GtkWidget *color_filters); #endif /* color_edit_dlg.h */ diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c index 2a6222302e..92a27d241c 100644 --- a/gtk/conversations_table.c +++ b/gtk/conversations_table.c @@ -28,10 +28,6 @@ #endif #include -#include -#include -#include -#include #include #include @@ -70,7 +66,7 @@ /* convert a port number into a string */ static char * -ct_port_to_str(int port_type, guint32 port) +ct_port_to_str(int port_type_val, guint32 port) { static int i=0; static gchar *strp, str[4][12]; @@ -78,7 +74,7 @@ ct_port_to_str(int port_type, guint32 port) strp=str[i]; - switch(port_type){ + switch(port_type_val){ case PT_TCP: case PT_UDP: case PT_SCTP: @@ -101,22 +97,22 @@ ct_port_to_str(int port_type, guint32 port) #define FN_SRC_PORT 3 #define FN_DST_PORT 4 #define FN_ANY_PORT 5 -/* given an address (to distinguis between ipv4 and ipv6 for tcp/udp +/* given an address (to distinguish between ipv4 and ipv6 for tcp/udp), a port_type and a name_type (FN_...) - return a string for the filter name + return a string for the filter name. - some addresses, like AT_ETHER may actually be any of multiple types + Some addresses, like AT_ETHER may actually be any of multiple types of protocols, either ethernet, tokenring, fddi, wlan etc so we must be - more specific there thats why we need specific_addr_type + more specific there; that's why we need specific_addr_type. */ static const char * -ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int name_type) +ct_get_filter_name(address *addr, int specific_addr_type_val, int port_type_val, int name_type_val) { - switch(name_type){ + switch(name_type_val){ case FN_SRC_ADDRESS: switch(addr->type){ case AT_ETHER: - switch(specific_addr_type){ + switch(specific_addr_type_val){ case SAT_ETHER: return "eth.src"; case SAT_WLAN: @@ -138,7 +134,7 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam case AT_FC: return "fc.s_id"; case AT_URI: - switch(specific_addr_type){ + switch(specific_addr_type_val){ case SAT_JXTA: return "jxta.message.src"; default: @@ -154,7 +150,7 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam case FN_DST_ADDRESS: switch(addr->type){ case AT_ETHER: - switch(specific_addr_type){ + switch(specific_addr_type_val){ case SAT_ETHER: return "eth.dst"; case SAT_WLAN: @@ -176,7 +172,7 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam case AT_FC: return "fc.d_id"; case AT_URI: - switch(specific_addr_type){ + switch(specific_addr_type_val){ case SAT_JXTA: return "jxta.message.dst"; default: @@ -192,7 +188,7 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam case FN_ANY_ADDRESS: switch(addr->type){ case AT_ETHER: - switch(specific_addr_type){ + switch(specific_addr_type_val){ case SAT_ETHER: return "eth.addr"; case SAT_WLAN: @@ -214,7 +210,7 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam case AT_FC: return "fc.id"; case AT_URI: - switch(specific_addr_type){ + switch(specific_addr_type_val){ case SAT_JXTA: return "jxta.message.address"; default: @@ -228,7 +224,7 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam } break; case FN_SRC_PORT: - switch(port_type){ + switch(port_type_val){ case PT_TCP: return "tcp.srcport"; case PT_UDP: @@ -242,7 +238,7 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam } break; case FN_DST_PORT: - switch(port_type){ + switch(port_type_val){ case PT_TCP: return "tcp.dstport"; case PT_UDP: @@ -256,7 +252,7 @@ ct_get_filter_name(address *addr, int specific_addr_type, int port_type, int nam } break; case FN_ANY_PORT: - switch(port_type){ + switch(port_type_val){ case PT_TCP: return "tcp.port"; case PT_UDP: @@ -457,7 +453,7 @@ static void ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callback_action) { int direction; - guint32 index = 0; + guint32 idx = 0; conversations_table *ct = (conversations_table *)callback_data; GtkTreeIter iter; GtkTreeModel *model; @@ -473,14 +469,14 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac return; gtk_tree_model_get (model, &iter, - INDEX_COLUMN, &index, + INDEX_COLUMN, &idx, -1); - if(index>= ct->num_conversations){ + if(idx>= ct->num_conversations){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "No conversation selected"); return; } - conv = &g_array_index(ct->conversations, conv_t, index); + conv = &g_array_index(ct->conversations, conv_t, idx); sport=ct_port_to_str(conv->port_type, conv->src_port); dport=ct_port_to_str(conv->port_type, conv->dst_port); @@ -1192,13 +1188,13 @@ csv_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter, csv_t *csv = (csv_t *)data; gchar *table_text; int i; - unsigned index; + unsigned idx; conv_t *conv; double duration_s; guint64 value; - gtk_tree_model_get(model, iter, INDEX_COLUMN, &index, -1); - conv=&g_array_index(csv->talkers->conversations, conv_t, index); + gtk_tree_model_get(model, iter, INDEX_COLUMN, &idx, -1); + conv=&g_array_index(csv->talkers->conversations, conv_t, idx); duration_s = nstime_to_sec(&conv->stop_time) - nstime_to_sec(&conv->start_time); for (i=0; i< csv->nb_cols; i++) { @@ -1834,7 +1830,7 @@ conversation_match(gconstpointer v, gconstpointer w) void -add_conversation_table_data(conversations_table *ct, const address *src, const address *dst, guint32 src_port, guint32 dst_port, int num_frames, int num_bytes, nstime_t *ts, SAT_E sat, int port_type) +add_conversation_table_data(conversations_table *ct, const address *src, const address *dst, guint32 src_port, guint32 dst_port, int num_frames, int num_bytes, nstime_t *ts, SAT_E sat, int port_type_val) { const address *addr1, *addr2; guint32 port1, port2; @@ -1897,7 +1893,7 @@ add_conversation_table_data(conversations_table *ct, const address *src, const a COPY_ADDRESS(&conv.src_address, addr1); COPY_ADDRESS(&conv.dst_address, addr2); conv.sat=sat; - conv.port_type=port_type; + conv.port_type=port_type_val; conv.src_port=port1; conv.dst_port=port2; conv.rx_frames=0; diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c index eddd4bc803..5d22fc9abe 100644 --- a/gtk/decode_as_dlg.c +++ b/gtk/decode_as_dlg.c @@ -477,7 +477,7 @@ decode_show_clear_cb (GtkWidget *clear_bt _U_, gpointer parent_w) * @param gpointer Unknown */ static gboolean -decode_show_delete_cb (GtkWidget *decode_w _U_, gpointer dummy _U_) +decode_show_delete_cb (GtkWidget *win _U_, gpointer dummy _U_) { decode_show_ok_cb(NULL, decode_show_w); return FALSE; @@ -918,9 +918,9 @@ decode_close_cb (GtkWidget *close_bt _U_, gpointer parent_w) * @param dummy Unknown */ static gboolean -decode_delete_cb (GtkWidget *decode_w, gpointer dummy _U_) +decode_delete_cb (GtkWidget *decode_w_lcl, gpointer dummy _U_) { - decode_close_cb(NULL, decode_w); + decode_close_cb(NULL, decode_w_lcl); return FALSE; } diff --git a/gtk/follow_ssl.c b/gtk/follow_ssl.c index 9e9f5f8bb7..03a66c0536 100644 --- a/gtk/follow_ssl.c +++ b/gtk/follow_ssl.c @@ -286,7 +286,7 @@ follow_ssl_stream_cb(GtkWidget * w, gpointer data _U_) #define FLT_BUF_SIZE 1024 /* - * XXX - the routine pointed to by "print_line" doesn't get handed lines, + * XXX - the routine pointed to by "print_line_fcn_p" doesn't get handed lines, * it gets handed bufferfuls. That's fine for "follow_write_raw()" * and "follow_add_to_gtk_text()", but, as "follow_print_text()" calls * the "print_line()" routine from "print.c", and as that routine might @@ -304,7 +304,7 @@ follow_ssl_stream_cb(GtkWidget * w, gpointer data _U_) */ frs_return_t follow_read_ssl_stream(follow_info_t *follow_info, - gboolean (*print_line)(char *, size_t, gboolean, void *), + gboolean (*print_line_fcn_p)(char *, size_t, gboolean, void *), void *arg) { guint32 global_client_pos = 0, global_server_pos = 0; @@ -334,7 +334,7 @@ follow_read_ssl_stream(follow_info_t *follow_info, size_t nchars = rec->data.data_len; gchar *buffer = g_memdup(rec->data.data, (guint) nchars); - frs_return = follow_show(follow_info, print_line, buffer, nchars, + frs_return = follow_show(follow_info, print_line_fcn_p, buffer, nchars, rec->is_server, arg, global_pos, &server_packet_count, &client_packet_count); g_free(buffer); diff --git a/gtk/follow_stream.c b/gtk/follow_stream.c index b99b7f80a1..435d578ada 100644 --- a/gtk/follow_stream.c +++ b/gtk/follow_stream.c @@ -79,19 +79,19 @@ GList *follow_infos = NULL; static frs_return_t follow_read_stream(follow_info_t *follow_info, - gboolean (*print_line)(char *, size_t, gboolean, void *), + gboolean (*print_line_fcn_p)(char *, size_t, gboolean, void *), void *arg) { switch(follow_info->follow_type) { case FOLLOW_TCP : - return follow_read_tcp_stream(follow_info, print_line, arg); + return follow_read_tcp_stream(follow_info, print_line_fcn_p, arg); case FOLLOW_UDP : - return follow_read_udp_stream(follow_info, print_line, arg); + return follow_read_udp_stream(follow_info, print_line_fcn_p, arg); case FOLLOW_SSL : - return follow_read_ssl_stream(follow_info, print_line, arg); + return follow_read_ssl_stream(follow_info, print_line_fcn_p, arg); default : g_assert_not_reached(); @@ -976,7 +976,7 @@ follow_destroy_cb(GtkWidget *w, gpointer data _U_) frs_return_t follow_show(follow_info_t *follow_info, - gboolean (*print_line)(char *, size_t, gboolean, void *), + gboolean (*print_line_fcn_p)(char *, size_t, gboolean, void *), char *buffer, size_t nchars, gboolean is_server, void *arg, guint32 *global_pos, guint32 *server_packet_count, guint32 *client_packet_count) @@ -990,7 +990,7 @@ follow_show(follow_info_t *follow_info, case SHOW_EBCDIC: /* If our native arch is ASCII, call: */ EBCDIC_to_ASCII(buffer, (guint) nchars); - if (!(*print_line) (buffer, nchars, is_server, arg)) + if (!(*print_line_fcn_p) (buffer, nchars, is_server, arg)) return FRS_PRINT_ERROR; break; @@ -998,7 +998,7 @@ follow_show(follow_info_t *follow_info, /* If our native arch is EBCDIC, call: * ASCII_TO_EBCDIC(buffer, nchars); */ - if (!(*print_line) (buffer, nchars, is_server, arg)) + if (!(*print_line_fcn_p) (buffer, nchars, is_server, arg)) return FRS_PRINT_ERROR; break; @@ -1006,7 +1006,7 @@ follow_show(follow_info_t *follow_info, /* Don't translate, no matter what the native arch * is. */ - if (!(*print_line) (buffer, nchars, is_server, arg)) + if (!(*print_line_fcn_p) (buffer, nchars, is_server, arg)) return FRS_PRINT_ERROR; break; @@ -1053,7 +1053,7 @@ follow_show(follow_info_t *follow_info, (*global_pos) += i; *cur++ = '\n'; *cur = 0; - if (!(*print_line) (hexbuf, strlen(hexbuf), is_server, arg)) + if (!(*print_line_fcn_p) (hexbuf, strlen(hexbuf), is_server, arg)) return FRS_PRINT_ERROR; } break; @@ -1063,7 +1063,7 @@ follow_show(follow_info_t *follow_info, g_snprintf(initbuf, sizeof(initbuf), "char peer%d_%d[] = {\n", is_server ? 1 : 0, is_server ? (*server_packet_count)++ : (*client_packet_count)++); - if (!(*print_line) (initbuf, strlen(initbuf), is_server, arg)) + if (!(*print_line_fcn_p) (initbuf, strlen(initbuf), is_server, arg)) return FRS_PRINT_ERROR; while (current_pos < nchars) { @@ -1097,7 +1097,7 @@ follow_show(follow_info_t *follow_info, (*global_pos) += i; hexbuf[cur++] = '\n'; hexbuf[cur] = 0; - if (!(*print_line) (hexbuf, strlen(hexbuf), is_server, arg)) + if (!(*print_line_fcn_p) (hexbuf, strlen(hexbuf), is_server, arg)) return FRS_PRINT_ERROR; } break; diff --git a/gtk/follow_tcp.c b/gtk/follow_tcp.c index 6ea8cfbcba..723f7d7e56 100644 --- a/gtk/follow_tcp.c +++ b/gtk/follow_tcp.c @@ -314,7 +314,7 @@ follow_tcp_stream_cb(GtkWidget * w, gpointer data _U_) #define FLT_BUF_SIZE 1024 /* - * XXX - the routine pointed to by "print_line" doesn't get handed lines, + * XXX - the routine pointed to by "print_line_fcn_p" doesn't get handed lines, * it gets handed bufferfuls. That's fine for "follow_write_raw()" * and "follow_add_to_gtk_text()", but, as "follow_print_text()" calls * the "print_line()" routine from "print.c", and as that routine might @@ -332,7 +332,7 @@ follow_tcp_stream_cb(GtkWidget * w, gpointer data _U_) */ frs_return_t follow_read_tcp_stream(follow_info_t *follow_info, - gboolean (*print_line)(char *, size_t, gboolean, void *), + gboolean (*print_line_fcn_p)(char *, size_t, gboolean, void *), void *arg) { tcp_stream_chunk sc; @@ -400,7 +400,7 @@ follow_read_tcp_stream(follow_info_t *follow_info, sc.dlen -= (guint32) nchars; if (!skip) { - frs_return = follow_show(follow_info, print_line, buffer, + frs_return = follow_show(follow_info, print_line_fcn_p, buffer, nchars, is_server, arg, global_pos, &server_packet_count, &client_packet_count); diff --git a/gtk/follow_udp.c b/gtk/follow_udp.c index 3ccf59c2e4..097c1e62bb 100644 --- a/gtk/follow_udp.c +++ b/gtk/follow_udp.c @@ -235,7 +235,7 @@ follow_udp_stream_cb(GtkWidget *w, gpointer data _U_) #define FLT_BUF_SIZE 1024 /* - * XXX - the routine pointed to by "print_line" doesn't get handed lines, + * XXX - the routine pointed to by "print_line_fcn_p" doesn't get handed lines, * it gets handed bufferfuls. That's fine for "follow_write_raw()" * and "follow_add_to_gtk_text()", but, as "follow_print_text()" calls * the "print_line()" routine from "print.c", and as that routine might @@ -253,7 +253,7 @@ follow_udp_stream_cb(GtkWidget *w, gpointer data _U_) */ frs_return_t follow_read_udp_stream(follow_info_t *follow_info, - gboolean (*print_line)(char *, size_t, gboolean, void *), + gboolean (*print_line_fcn_p)(char *, size_t, gboolean, void *), void *arg) { guint32 global_client_pos = 0, global_server_pos = 0; @@ -286,7 +286,7 @@ follow_read_udp_stream(follow_info_t *follow_info, buffer = g_memdup(follow_record->data->data, follow_record->data->len); - frs_return = follow_show(follow_info, print_line, + frs_return = follow_show(follow_info, print_line_fcn_p, buffer, follow_record->data->len, follow_record->is_server, arg, diff --git a/gtk/main.c b/gtk/main.c index 87c2558acc..0f06437aab 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1774,10 +1774,10 @@ read_configuration_files(char **gdp_path, char **dp_path) char *gpf_path, *pf_path; char *cf_path, *df_path; int pf_open_errno, pf_read_errno; - e_prefs *prefs; + e_prefs *prefs_p; /* Read the preference files. */ - prefs = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path, + prefs_p = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path, &pf_open_errno, &pf_read_errno, &pf_path); if (gpf_path != NULL) { @@ -1809,7 +1809,7 @@ read_configuration_files(char **gdp_path, char **dp_path) #ifdef _WIN32 /* if the user wants a console to be always there, well, we should open one for him */ - if (prefs->gui_console_open == console_open_always) { + if (prefs_p->gui_console_open == console_open_always) { create_console(); } #endif @@ -1864,7 +1864,7 @@ read_configuration_files(char **gdp_path, char **dp_path) *dp_path = NULL; } - return prefs; + return prefs_p; } /* And now our feature presentation... [ fade to music ] */ @@ -1897,7 +1897,7 @@ main(int argc, char *argv[]) gchar *rc_file, *cf_name = NULL, *rfilter = NULL, *jfilter = NULL; dfilter_t *rfcode = NULL; gboolean rfilter_parse_failed = FALSE; - e_prefs *prefs; + e_prefs *prefs_p; char badopt; GtkWidget *splash_win = NULL; gpointer priv_warning_dialog; @@ -2237,7 +2237,7 @@ main(int argc, char *argv[]) We must do that before we read the preferences as well. */ prefs_register_modules(); - prefs = read_configuration_files (&gdp_path, &dp_path); + prefs_p = read_configuration_files (&gdp_path, &dp_path); /* multithread support currently doesn't seem to work in win32 gtk2.0.6 */ #if !defined(_WIN32) && defined(G_THREADS_ENABLED) && defined USE_THREADS @@ -2250,7 +2250,7 @@ main(int argc, char *argv[]) } #else /* !_WIN32 && G_THREADS_ENABLED && USE_THREADS */ /* this is to keep tap extensions updating once every 3 seconds */ - tap_update_timer_id = g_timeout_add(prefs->tap_update_interval, tap_update_cb, NULL); + tap_update_timer_id = g_timeout_add(prefs_p->tap_update_interval, tap_update_cb, NULL); #endif /* !_WIN32 && G_THREADS_ENABLED && USE_THREADS */ g_timeout_add(info_update_freq, resolv_update_cb, NULL); @@ -2351,8 +2351,8 @@ main(int argc, char *argv[]) #endif break; case 'm': /* Fixed-width font for the display */ - g_free(prefs->gui_font_name); - prefs->gui_font_name = g_strdup(optarg); + g_free(prefs_p->gui_font_name); + prefs_p->gui_font_name = g_strdup(optarg); break; case 'n': /* No name resolution */ g_resolv_flags = RESOLV_NONE; @@ -2572,7 +2572,7 @@ main(int argc, char *argv[]) if (start_capture || list_link_layer_types) { /* Did the user specify an interface to use? */ if (!capture_opts_trim_iface(&global_capture_opts, - (prefs->capture_device) ? get_if_name(prefs->capture_device) : NULL)) { + (prefs_p->capture_device) ? get_if_name(prefs_p->capture_device) : NULL)) { exit(2); } } @@ -2596,7 +2596,7 @@ main(int argc, char *argv[]) set_disabled_protos_list(); } - build_column_format_array(&cfile.cinfo, prefs->num_cols, TRUE); + build_column_format_array(&cfile.cinfo, prefs_p->num_cols, TRUE); /* read in rc file from global and personal configuration paths. */ rc_file = get_datafile_path(RC_FILE); @@ -2617,7 +2617,7 @@ main(int argc, char *argv[]) /* Everything is prepared now, preferences and command line was read in */ /* Pop up the main window. */ - create_main_window(pl_size, tv_size, bv_size, prefs); + create_main_window(pl_size, tv_size, bv_size, prefs_p); /* Read the dynamic part of the recent file, as we have the gui now ready for it. */ recent_read_dynamic(&rf_path, &rf_open_errno); @@ -3351,7 +3351,7 @@ top_level_key_pressed_cb(GtkWidget *w _U_, GdkEventKey *event, gpointer user_dat } static void -create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) +create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs_p) { GtkAccelGroup *accel; gchar *title; @@ -3382,7 +3382,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) #ifdef HAVE_IGE_MAC_INTEGRATION /* MacOS X native menus are created and displayed by main_menu_new() */ - if(!prefs->gui_macosx_style) { + if(!prefs_p->gui_macosx_style) { #endif gtk_window_add_accel_group(GTK_WINDOW(top_level), accel); gtk_widget_show(menubar); @@ -3403,13 +3403,13 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) gtk_widget_set_size_request(pkt_scrollw, -1, pl_size); gtk_widget_show_all(pkt_scrollw); #else - pkt_scrollw = packet_list_new(prefs); + pkt_scrollw = packet_list_new(prefs_p); gtk_widget_set_size_request(packet_list, -1, pl_size); gtk_widget_show(pkt_scrollw); #endif /* Tree view */ - tv_scrollw = main_tree_view_new(prefs, &tree_view); + tv_scrollw = main_tree_view_new(prefs_p, &tree_view); gtk_widget_set_size_request(tv_scrollw, -1, tv_size); gtk_widget_show(tv_scrollw); diff --git a/gtk/menus.c b/gtk/menus.c index 7d44f249d7..dd5e9641e4 100644 --- a/gtk/menus.c +++ b/gtk/menus.c @@ -3187,7 +3187,7 @@ add_protocol_prefs_menu (pref_t *pref, gpointer data) } static void -rebuild_protocol_prefs_menu (module_t *prefs, gboolean preferences) +rebuild_protocol_prefs_menu (module_t *prefs_module_p, gboolean preferences) { GtkWidget *menu_preferences, *menu_item; GtkWidget *sub_menu; @@ -3199,7 +3199,7 @@ rebuild_protocol_prefs_menu (module_t *prefs, gboolean preferences) sub_menu = gtk_menu_new(); gtk_menu_item_set_submenu (GTK_MENU_ITEM(menu_preferences), sub_menu); - label = g_strdup_printf ("%s Preferences...", prefs->description); + label = g_strdup_printf ("%s Preferences...", prefs_module_p->description); menu_item = gtk_image_menu_item_new_with_label (label); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(menu_item), gtk_image_new_from_stock(GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU)); @@ -3213,7 +3213,7 @@ rebuild_protocol_prefs_menu (module_t *prefs, gboolean preferences) gtk_menu_shell_append (GTK_MENU_SHELL(sub_menu), menu_item); gtk_widget_show (menu_item); - prefs_pref_foreach(prefs, add_protocol_prefs_menu, prefs); + prefs_pref_foreach(prefs_module_p, add_protocol_prefs_menu, prefs_module_p); } else { /* No preferences, remove sub menu */ gtk_menu_item_set_submenu (GTK_MENU_ITEM(menu_preferences), NULL); @@ -3325,8 +3325,8 @@ set_menus_for_selected_tree_row(capture_file *cf) prev_abbrev = g_object_get_data(G_OBJECT(tree_view_menu_factory), "menu_abbrev"); if (!prev_abbrev || (strcmp (prev_abbrev, abbrev) != 0)) { /* No previous protocol or protocol changed - update Protocol Preferences menu */ - module_t *prefs = prefs_find_module(abbrev); - rebuild_protocol_prefs_menu (prefs, properties); + module_t *prefs_module_p = prefs_find_module(abbrev); + rebuild_protocol_prefs_menu (prefs_module_p, properties); g_object_set_data(G_OBJECT(tree_view_menu_factory), "menu_abbrev", g_strdup(abbrev)); g_free (prev_abbrev); -- 2.34.1