diff options
-rw-r--r-- | gtk/gtkglobals.h | 4 | ||||
-rw-r--r-- | gtk/main.c | 44 | ||||
-rw-r--r-- | gtk/main_packet_list.c | 4 | ||||
-rw-r--r-- | gtk/main_proto_draw.c | 24 | ||||
-rw-r--r-- | gtk/main_toolbar.c | 10 | ||||
-rw-r--r-- | gtk/mcast_stream.c | 8 | ||||
-rw-r--r-- | gtk/menus.c | 6 | ||||
-rw-r--r-- | gtk/new_packet_list.c | 8 | ||||
-rw-r--r-- | gtk/packet_list_store.c | 10 | ||||
-rw-r--r-- | gtk/pixmap_save.c | 12 | ||||
-rw-r--r-- | gtk/prefs_dlg.c | 28 | ||||
-rw-r--r-- | gtk/proto_dlg.c | 4 | ||||
-rw-r--r-- | gtk/proto_hier_stats_dlg.c | 4 | ||||
-rw-r--r-- | gtk/rtp_player.c | 50 | ||||
-rw-r--r-- | gtk/sctp_byte_graph_dlg.c | 4 | ||||
-rw-r--r-- | gtk/sctp_graph_dlg.c | 4 | ||||
-rw-r--r-- | gtk/sctp_stat.c | 54 | ||||
-rw-r--r-- | gtk/u3.c | 6 | ||||
-rw-r--r-- | gtk/uat_gui.c | 14 | ||||
-rw-r--r-- | gtk/voip_calls.c | 12 |
20 files changed, 155 insertions, 155 deletions
diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h index f233d2c9d3..e4ddb99b8b 100644 --- a/gtk/gtkglobals.h +++ b/gtk/gtkglobals.h @@ -48,10 +48,10 @@ extern GtkWidget *packet_list; #endif /** Tree view (packet details) pane. */ -extern GtkWidget *tree_view; +extern GtkWidget *tree_view_gbl; /** Byte notebook (packet bytes) pane. */ -extern GtkWidget *byte_nb_ptr; +extern GtkWidget *byte_nb_ptr_gbl; /** The filter text entry in the filter toolbar. */ extern GtkWidget *main_display_filter_widget; diff --git a/gtk/main.c b/gtk/main.c index 0f06437aab..93d667f2ae 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -191,7 +191,7 @@ capture_file cfile; /* "exported" main widgets */ -GtkWidget *top_level = NULL, *pkt_scrollw, *tree_view, *byte_nb_ptr; +GtkWidget *top_level = NULL, *pkt_scrollw, *tree_view_gbl, *byte_nb_ptr_gbl; /* placement widgets (can be a bit confusing, because of the many layout possibilities */ static GtkWidget *main_vbox, *main_pane_v1, *main_pane_v2, *main_pane_h1, *main_pane_h2; @@ -726,7 +726,7 @@ tree_view_selection_changed_cb(GtkTreeSelection *sel, gpointer user_data _U_) * Which byte view is displaying the current protocol tree * row's data? */ - byte_view = get_notebook_bv_ptr(byte_nb_ptr); + byte_view = get_notebook_bv_ptr(byte_nb_ptr_gbl); if (byte_view == NULL) return; /* none */ @@ -742,9 +742,9 @@ tree_view_selection_changed_cb(GtkTreeSelection *sel, gpointer user_data _U_) gtk_tree_model_get(model, &iter, 1, &finfo, -1); if (!finfo) return; - set_notebook_page(byte_nb_ptr, finfo->ds_tvb); + set_notebook_page(byte_nb_ptr_gbl, finfo->ds_tvb); - byte_view = get_notebook_bv_ptr(byte_nb_ptr); + byte_view = get_notebook_bv_ptr(byte_nb_ptr_gbl); byte_data = get_byte_view_data_and_length(byte_view, &byte_len); g_assert(byte_data != NULL); @@ -804,12 +804,12 @@ tree_view_selection_changed_cb(GtkTreeSelection *sel, gpointer user_data _U_) void collapse_all_cb(GtkWidget *widget _U_, gpointer data _U_) { if (cfile.edt->tree) - collapse_all_tree(cfile.edt->tree, tree_view); + collapse_all_tree(cfile.edt->tree, tree_view_gbl); } void expand_all_cb(GtkWidget *widget _U_, gpointer data _U_) { if (cfile.edt->tree) - expand_all_tree(cfile.edt->tree, tree_view); + expand_all_tree(cfile.edt->tree, tree_view_gbl); } void apply_as_custom_column_cb (GtkWidget *widget _U_, gpointer data _U_) @@ -833,10 +833,10 @@ void apply_as_custom_column_cb (GtkWidget *widget _U_, gpointer data _U_) void expand_tree_cb(GtkWidget *widget _U_, gpointer data _U_) { GtkTreePath *path; - path = tree_find_by_field_info(GTK_TREE_VIEW(tree_view), cfile.finfo_selected); + path = tree_find_by_field_info(GTK_TREE_VIEW(tree_view_gbl), cfile.finfo_selected); if(path) { /* the mouse position is at an entry, expand that one */ - gtk_tree_view_expand_row(GTK_TREE_VIEW(tree_view), path, TRUE); + gtk_tree_view_expand_row(GTK_TREE_VIEW(tree_view_gbl), path, TRUE); gtk_tree_path_free(path); } } @@ -845,7 +845,7 @@ void resolve_name_cb(GtkWidget *widget _U_, gpointer data _U_) { if (cfile.edt->tree) { guint32 tmp = g_resolv_flags; g_resolv_flags = RESOLV_ALL; - proto_tree_draw(cfile.edt->tree, tree_view); + proto_tree_draw(cfile.edt->tree, tree_view_gbl); g_resolv_flags = tmp; } } @@ -1599,7 +1599,7 @@ main_cf_cb_packet_selected(gpointer data) * highlight the field that is found in the tree and hex displays. */ if((cfile.string || cfile.hex) && cfile.search_pos != 0) { highlight_field(cf->edt->tvb, cfile.search_pos, - (GtkTreeView *)tree_view, cf->edt->tree); + (GtkTreeView *)tree_view_gbl, cf->edt->tree); cfile.search_pos = 0; /* Reset the position */ } @@ -3055,7 +3055,7 @@ static GtkWidget *main_widget_layout(gint layout_content) case(layout_pane_content_pdetails): return tv_scrollw; case(layout_pane_content_pbytes): - return byte_nb_ptr; + return byte_nb_ptr_gbl; default: g_assert_not_reached(); return NULL; @@ -3083,7 +3083,7 @@ void main_widgets_rearrange(void) { #endif g_object_ref(G_OBJECT(pkt_scrollw)); g_object_ref(G_OBJECT(tv_scrollw)); - g_object_ref(G_OBJECT(byte_nb_ptr)); + g_object_ref(G_OBJECT(byte_nb_ptr_gbl)); g_object_ref(G_OBJECT(statusbar)); g_object_ref(G_OBJECT(main_pane_v1)); g_object_ref(G_OBJECT(main_pane_v2)); @@ -3253,9 +3253,9 @@ main_widgets_show_or_hide(void) } if (recent.byte_view_show && have_capture_file) { - gtk_widget_show(byte_nb_ptr); + gtk_widget_show(byte_nb_ptr_gbl); } else { - gtk_widget_hide(byte_nb_ptr); + gtk_widget_hide(byte_nb_ptr_gbl); } if (have_capture_file) { @@ -3409,22 +3409,22 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs_p) #endif /* Tree view */ - tv_scrollw = main_tree_view_new(prefs_p, &tree_view); + tv_scrollw = main_tree_view_new(prefs_p, &tree_view_gbl); gtk_widget_set_size_request(tv_scrollw, -1, tv_size); gtk_widget_show(tv_scrollw); - g_signal_connect(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)), + g_signal_connect(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view_gbl)), "changed", G_CALLBACK(tree_view_selection_changed_cb), NULL); - g_signal_connect(tree_view, "button_press_event", G_CALLBACK(popup_menu_handler), + g_signal_connect(tree_view_gbl, "button_press_event", G_CALLBACK(popup_menu_handler), g_object_get_data(G_OBJECT(popup_menu_object), PM_TREE_VIEW_KEY)); - gtk_widget_show(tree_view); + gtk_widget_show(tree_view_gbl); /* Byte view. */ - byte_nb_ptr = byte_view_new(); - gtk_widget_set_size_request(byte_nb_ptr, -1, bv_size); - gtk_widget_show(byte_nb_ptr); + byte_nb_ptr_gbl = byte_view_new(); + gtk_widget_set_size_request(byte_nb_ptr_gbl, -1, bv_size); + gtk_widget_show(byte_nb_ptr_gbl); - g_signal_connect(byte_nb_ptr, "button_press_event", G_CALLBACK(popup_menu_handler), + g_signal_connect(byte_nb_ptr_gbl, "button_press_event", G_CALLBACK(popup_menu_handler), g_object_get_data(G_OBJECT(popup_menu_object), PM_BYTES_VIEW_KEY)); /* Panes for the packet list, tree, and byte view */ diff --git a/gtk/main_packet_list.c b/gtk/main_packet_list.c index fcf7321cf2..e80dd1fee0 100644 --- a/gtk/main_packet_list.c +++ b/gtk/main_packet_list.c @@ -450,8 +450,8 @@ packet_list_select_cb(GtkWidget *w _U_, gint row, gint col _U_, GdkEventButton * return; /* Remove the hex display tabbed pages */ - while( (gtk_notebook_get_nth_page( GTK_NOTEBOOK(byte_nb_ptr), 0))) - gtk_notebook_remove_page( GTK_NOTEBOOK(byte_nb_ptr), 0); + while( (gtk_notebook_get_nth_page( GTK_NOTEBOOK(byte_nb_ptr_gbl), 0))) + gtk_notebook_remove_page( GTK_NOTEBOOK(byte_nb_ptr_gbl), 0); cf_select_packet(&cfile, row); gtk_widget_grab_focus(packet_list); diff --git a/gtk/main_proto_draw.c b/gtk/main_proto_draw.c index 6b4fc3fd11..1c403f898b 100644 --- a/gtk/main_proto_draw.c +++ b/gtk/main_proto_draw.c @@ -175,7 +175,7 @@ void redraw_packet_bytes_all(void) { if (cfile.current_frame != NULL) - redraw_packet_bytes( byte_nb_ptr, cfile.current_frame, cfile.finfo_selected); + redraw_packet_bytes( byte_nb_ptr_gbl, cfile.current_frame, cfile.finfo_selected); redraw_packet_bytes_packet_wins(); @@ -713,7 +713,7 @@ add_byte_tab(GtkWidget *byte_nb, const char *name, tvbuff_t *tvb, void add_main_byte_views(epan_dissect_t *edt) { - add_byte_views(edt, tree_view, byte_nb_ptr); + add_byte_views(edt, tree_view_gbl, byte_nb_ptr_gbl); } void @@ -854,7 +854,7 @@ copy_hex_cb(GtkWidget * w _U_, gpointer data _U_, copy_data_type data_type) GString* copy_buffer = g_string_new(""); /* String to copy to clipboard */ - bv = get_notebook_bv_ptr(byte_nb_ptr); + bv = get_notebook_bv_ptr(byte_nb_ptr_gbl); if (bv == NULL) { /* shouldn't happen */ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not find the corresponding text window!"); @@ -953,7 +953,7 @@ savehex_save_clicked_cb(GtkWidget * w _U_, gpointer data _U_) /* XXX: Must check if file name exists first */ - bv = get_notebook_bv_ptr(byte_nb_ptr); + bv = get_notebook_bv_ptr(byte_nb_ptr_gbl); if (bv == NULL) { /* shouldn't happen */ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not find the corresponding text window!"); @@ -1017,7 +1017,7 @@ void savehex_cb(GtkWidget * w _U_, gpointer data _U_) #endif /* don't show up the dialog, if no data has to be saved */ - bv = get_notebook_bv_ptr(byte_nb_ptr); + bv = get_notebook_bv_ptr(byte_nb_ptr_gbl); if (bv == NULL) { /* shouldn't happen */ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not find the corresponding text window!"); @@ -1667,7 +1667,7 @@ static void tree_cell_renderer(GtkTreeViewColumn *tree_column _U_, } GtkWidget * -main_tree_view_new(e_prefs *prefs, GtkWidget **tree_view_p) +main_tree_view_new(e_prefs *prefs_p, GtkWidget **tree_view_p) { GtkWidget *tv_scrollw, *tree_view; GtkTreeStore *store; @@ -1702,7 +1702,7 @@ main_tree_view_new(e_prefs *prefs, GtkWidget **tree_view_p) g_signal_connect(tree_view, "row-expanded", G_CALLBACK(expand_tree), NULL); g_signal_connect(tree_view, "row-collapsed", G_CALLBACK(collapse_tree), NULL); gtk_container_add( GTK_CONTAINER(tv_scrollw), tree_view ); - set_ptree_sel_browse(tree_view, prefs->gui_ptree_sel_browse); + set_ptree_sel_browse(tree_view, prefs_p->gui_ptree_sel_browse); gtk_widget_modify_font(tree_view, user_font_get_regular()); remember_ptree_widget(tree_view); @@ -1738,7 +1738,7 @@ struct proto_tree_draw_info { void main_proto_tree_draw(proto_tree *protocol_tree) { - proto_tree_draw(protocol_tree, tree_view); + proto_tree_draw(protocol_tree, tree_view_gbl); } @@ -1900,16 +1900,16 @@ void clear_tree_and_hex_views(void) { /* Clear the hex dump by getting rid of all the byte views. */ - while (gtk_notebook_get_nth_page(GTK_NOTEBOOK(byte_nb_ptr), 0) != NULL) - gtk_notebook_remove_page(GTK_NOTEBOOK(byte_nb_ptr), 0); + while (gtk_notebook_get_nth_page(GTK_NOTEBOOK(byte_nb_ptr_gbl), 0) != NULL) + gtk_notebook_remove_page(GTK_NOTEBOOK(byte_nb_ptr_gbl), 0); /* Add a placeholder byte view so that there's at least something displayed in the byte view notebook. */ - add_byte_tab(byte_nb_ptr, "", NULL, NULL, tree_view); + add_byte_tab(byte_nb_ptr_gbl, "", NULL, NULL, tree_view_gbl); /* Clear the protocol tree by removing all nodes in the ctree. This is how it's done in testgtk.c in GTK+ */ - gtk_tree_store_clear(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(tree_view)))); + gtk_tree_store_clear(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(tree_view_gbl)))); } void diff --git a/gtk/main_toolbar.c b/gtk/main_toolbar.c index 18b8c87547..18ed38ebbc 100644 --- a/gtk/main_toolbar.c +++ b/gtk/main_toolbar.c @@ -264,14 +264,14 @@ toolbar_colorize_changed(gboolean packet_list_colorize) { #ifdef HAVE_LIBPCAP static void -auto_scroll_live_toggle_cb(GtkWidget *autoscroll_button, gpointer user_data _U_) { - menu_auto_scroll_live_changed(TOGGLE_BUTTON_GET_ACTIVE(TOGGLE_BUTTON(autoscroll_button))); +auto_scroll_live_toggle_cb(GtkWidget *autoscroll_button_lcl, gpointer user_data _U_) { + menu_auto_scroll_live_changed(TOGGLE_BUTTON_GET_ACTIVE(TOGGLE_BUTTON(autoscroll_button_lcl))); } void -toolbar_auto_scroll_live_changed(gboolean auto_scroll_live) { - if(TOGGLE_BUTTON_GET_ACTIVE(TOGGLE_BUTTON(autoscroll_button)) != auto_scroll_live) { - TOGGLE_BUTTON_SET_ACTIVE(TOGGLE_BUTTON(autoscroll_button), auto_scroll_live); +toolbar_auto_scroll_live_changed(gboolean auto_scroll_live_lcl) { + if(TOGGLE_BUTTON_GET_ACTIVE(TOGGLE_BUTTON(autoscroll_button)) != auto_scroll_live_lcl) { + TOGGLE_BUTTON_SET_ACTIVE(TOGGLE_BUTTON(autoscroll_button), auto_scroll_live_lcl); } } #endif diff --git a/gtk/mcast_stream.c b/gtk/mcast_stream.c index 1d7929443b..7e195c6133 100644 --- a/gtk/mcast_stream.c +++ b/gtk/mcast_stream.c @@ -359,8 +359,8 @@ register_tap_listener_mcast_stream(void) /* sliding window and buffer calculations */ /* compare two times */ -guint16 comparetimes(struct timeval *t1, struct timeval *t2, guint16 burstint){ - if(((t2->tv_sec - t1->tv_sec)*1000 + (t2->tv_usec - t1->tv_usec)/1000) > burstint){ +guint16 comparetimes(struct timeval *t1, struct timeval *t2, guint16 burstint_lcl){ + if(((t2->tv_sec - t1->tv_sec)*1000 + (t2->tv_usec - t1->tv_usec)/1000) > burstint_lcl){ return 1; } else{ return 0; @@ -368,7 +368,7 @@ guint16 comparetimes(struct timeval *t1, struct timeval *t2, guint16 burstint){ } /* calculate buffer usage */ -void buffusagecalc(mcast_stream_info_t *strinfo, packet_info *pinfo, double emptyspeed) +void buffusagecalc(mcast_stream_info_t *strinfo, packet_info *pinfo, double emptyspeed_lcl) { gint32 sec=0, usec=0, cur, prev; struct timeval *buffer; @@ -395,7 +395,7 @@ void buffusagecalc(mcast_stream_info_t *strinfo, packet_info *pinfo, double empt strinfo->element.buffusage+=pinfo->fd->pkt_len; /* bytes cleared from buffer */ - strinfo->element.buffusage-= (guint32) (timeelapsed * emptyspeed / 8); + strinfo->element.buffusage-= (guint32) (timeelapsed * emptyspeed_lcl / 8); if(strinfo->element.buffusage < 0) strinfo->element.buffusage=0; if(strinfo->element.buffusage > strinfo->element.topbuffusage) diff --git a/gtk/menus.c b/gtk/menus.c index dd5e9641e4..f613328e0e 100644 --- a/gtk/menus.c +++ b/gtk/menus.c @@ -2426,7 +2426,7 @@ popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data) } /* Check if we are on tree_view object */ - if (widget == tree_view) { + if (widget == tree_view_gbl) { tree_view_select(widget, (GdkEventButton *) event); } @@ -2446,13 +2446,13 @@ popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data) } /* Check if we are on byte_view object */ - if(widget == get_notebook_bv_ptr(byte_nb_ptr)) { + if(widget == get_notebook_bv_ptr(byte_nb_ptr_gbl)) { byte_view_select(widget, (GdkEventButton *) event); } /* GDK_2BUTTON_PRESS is a doubleclick -> expand/collapse tree row */ /* GTK version 1 seems to be doing this automatically */ - if (widget == tree_view && event->type == GDK_2BUTTON_PRESS) { + if (widget == tree_view_gbl && event->type == GDK_2BUTTON_PRESS) { GtkTreePath *path; if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c index 3bf660948c..9a7d37e699 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -816,7 +816,7 @@ new_packet_list_check_end(void) } gint -new_packet_list_find_row_from_data(gpointer data, gboolean select) +new_packet_list_find_row_from_data(gpointer data, gboolean select_flag) { GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist->view)); GtkTreeIter iter; @@ -836,7 +836,7 @@ new_packet_list_find_row_from_data(gpointer data, gboolean select) fdata = record->fdata; if(fdata == fdata_needle) { - if(select) + if(select_flag) scroll_to_and_select_iter(model, NULL, &iter); return fdata->num; @@ -912,8 +912,8 @@ new_packet_list_select_cb(GtkTreeView *tree_view, gpointer data _U_) return; /* Remove the hex display tab pages */ - while(gtk_notebook_get_nth_page(GTK_NOTEBOOK(byte_nb_ptr), 0)) - gtk_notebook_remove_page(GTK_NOTEBOOK(byte_nb_ptr), 0); + while(gtk_notebook_get_nth_page(GTK_NOTEBOOK(byte_nb_ptr_gbl), 0)) + gtk_notebook_remove_page(GTK_NOTEBOOK(byte_nb_ptr_gbl), 0); cf_select_packet(&cfile, row); gtk_widget_grab_focus(packetlist->view); diff --git a/gtk/packet_list_store.c b/gtk/packet_list_store.c index ec1caa15f6..903be98bcb 100644 --- a/gtk/packet_list_store.c +++ b/gtk/packet_list_store.c @@ -60,7 +60,7 @@ static void packet_list_tree_model_init(GtkTreeModelIface *iface); static void packet_list_finalize(GObject *object); static GtkTreeModelFlags packet_list_get_flags(GtkTreeModel *tree_model); static gint packet_list_get_n_columns(GtkTreeModel *tree_model); -static GType packet_list_get_column_type(GtkTreeModel *tree_model, gint index); +static GType packet_list_get_column_type(GtkTreeModel *tree_model, gint idx); static gboolean packet_list_get_iter(GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreePath *path); static GtkTreePath *packet_list_get_path(GtkTreeModel *tree_model, @@ -279,16 +279,16 @@ packet_list_get_n_columns(GtkTreeModel *tree_model) } static GType -packet_list_get_column_type(GtkTreeModel *tree_model, gint index) +packet_list_get_column_type(GtkTreeModel *tree_model, gint idx) { PacketList *packet_list; g_return_val_if_fail(PACKETLIST_IS_LIST(tree_model), G_TYPE_INVALID); packet_list = PACKET_LIST(tree_model); /* Note: We use one extra column to store the entire PacketListRecord */ - g_return_val_if_fail(index < packet_list->n_columns && - index >= 0, G_TYPE_INVALID); + g_return_val_if_fail(idx < packet_list->n_columns && + idx >= 0, G_TYPE_INVALID); - return packet_list->column_types[index]; + return packet_list->column_types[idx]; } static gboolean diff --git a/gtk/pixmap_save.c b/gtk/pixmap_save.c index a728df763e..56e67cc9e4 100644 --- a/gtk/pixmap_save.c +++ b/gtk/pixmap_save.c @@ -52,15 +52,15 @@ pixbuf_save_destroy_cb(GtkWidget *window _U_, gpointer data _U_) } static gboolean -pixbuf_save_button_cb(GtkWidget *save_as_w, GdkPixbuf *pixbuf) +pixbuf_save_button_cb(GtkWidget *save_as_w_lcl, GdkPixbuf *pixbuf) { gchar *filename, *file_type; GtkWidget *type_cm, *simple_w; GError *error = NULL; gboolean ret; - filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(save_as_w)); - type_cm = g_object_get_data(G_OBJECT(save_as_w), "type_cm"); + filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(save_as_w_lcl)); + type_cm = g_object_get_data(G_OBJECT(save_as_w_lcl), "type_cm"); file_type = gtk_combo_box_get_active_text(GTK_COMBO_BOX(type_cm)); /* Perhaps the user specified a directory instead of a file. @@ -71,9 +71,9 @@ pixbuf_save_button_cb(GtkWidget *save_as_w, GdkPixbuf *pixbuf) set_last_open_dir(filename); g_free(filename); g_free(file_type); - file_selection_set_current_folder(save_as_w, + file_selection_set_current_folder(save_as_w_lcl, get_last_open_dir()); - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(save_as_w), ""); + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(save_as_w_lcl), ""); return FALSE; } @@ -88,7 +88,7 @@ pixbuf_save_button_cb(GtkWidget *save_as_w, GdkPixbuf *pixbuf) error->message, simple_dialog_primary_end()); gtk_window_set_transient_for(GTK_WINDOW(simple_w), - GTK_WINDOW(save_as_w)); + GTK_WINDOW(save_as_w_lcl)); } return TRUE; } diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index 7315a05f21..72cc4e7625 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -221,14 +221,14 @@ pref_show(pref_t *pref, gpointer user_data) case PREF_RANGE: { - char *range_string; + char *range_str_p; g_free(pref->saved_val.range); pref->saved_val.range = range_copy(*pref->varp.range); - range_string = range_convert_range(*pref->varp.range); + range_str_p = range_convert_range(*pref->varp.range); pref->control = create_preference_entry(main_tb, pref->ordinal, label_string, pref->description, - range_string); + range_str_p); break; } @@ -697,7 +697,7 @@ create_preference_radio_buttons(GtkWidget *main_tb, int table_position, GtkTooltips *tooltips; GtkWidget *radio_button_hbox, *button = NULL; GSList *rb_group; - int index; + int idx; const enum_val_t *enum_valp; GtkWidget *event_box; @@ -708,8 +708,8 @@ create_preference_radio_buttons(GtkWidget *main_tb, int table_position, radio_button_hbox = gtk_hbox_new(FALSE, 0); rb_group = NULL; - for (enum_valp = enumvals, index = 0; enum_valp->name != NULL; - enum_valp++, index++) { + for (enum_valp = enumvals, idx = 0; enum_valp->name != NULL; + enum_valp++, idx++) { button = gtk_radio_button_new_with_label(rb_group, enum_valp->description); gtk_widget_show(button); @@ -792,7 +792,7 @@ create_preference_option_menu(GtkWidget *main_tb, int table_position, { GtkTooltips *tooltips; GtkWidget *menu_box, *combo_box; - int menu_index, index; + int menu_idx, idx; const enum_val_t *enum_valp; GtkWidget *event_box; @@ -805,15 +805,15 @@ create_preference_option_menu(GtkWidget *main_tb, int table_position, combo_box = gtk_combo_box_new_text (); if (tooltip_text != NULL && tooltips != NULL) gtk_tooltips_set_tip(tooltips, combo_box, tooltip_text, NULL); - menu_index = 0; - for (enum_valp = enumvals, index = 0; enum_valp->name != NULL; - enum_valp++, index++) { + menu_idx = 0; + for (enum_valp = enumvals, idx = 0; enum_valp->name != NULL; + enum_valp++, idx++) { gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), enum_valp->description); if (enum_valp->value == current_val) - menu_index = index; + menu_idx = idx; } /* Set the current value active */ - gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), menu_index); + gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), menu_idx); /* * Put the combo box in an hbox, so that it's only as wide @@ -1640,10 +1640,10 @@ prefs_main_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w) /* Treat this as a cancel, by calling "prefs_main_cancel_cb()" */ static gboolean -prefs_main_delete_event_cb(GtkWidget *prefs_w, GdkEvent *event _U_, +prefs_main_delete_event_cb(GtkWidget *prefs_w_lcl, GdkEvent *event _U_, gpointer parent_w _U_) { - prefs_main_cancel_cb(NULL, prefs_w); + prefs_main_cancel_cb(NULL, prefs_w_lcl); return FALSE; } diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c index b4af6b843f..bddf89cf9a 100644 --- a/gtk/proto_dlg.c +++ b/gtk/proto_dlg.c @@ -339,10 +339,10 @@ proto_destroy_cb(GtkWidget *w _U_, gpointer data _U_) a higher-level handler that says "OK, we've been asked to delete this, so destroy it"? */ static gboolean -proto_delete_event_cb(GtkWidget *proto_w, GdkEvent *event _U_, +proto_delete_event_cb(GtkWidget *proto_w_lcl, GdkEvent *event _U_, gpointer dummy _U_) { - proto_cancel_cb(NULL, proto_w); + proto_cancel_cb(NULL, proto_w_lcl); return FALSE; } diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c index 5493236251..5ecdadde34 100644 --- a/gtk/proto_hier_stats_dlg.c +++ b/gtk/proto_hier_stats_dlg.c @@ -208,11 +208,11 @@ fill_in_tree_node(GNode *node, gpointer data) } static void -fill_in_tree(GtkWidget *tree, ph_stats_t *ps) +fill_in_tree(GtkWidget *tree_lcl, ph_stats_t *ps) { draw_info_t di; - di.tree_view = GTK_TREE_VIEW(tree); + di.tree_view = GTK_TREE_VIEW(tree_lcl); di.iter = NULL; di.ps = ps; diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c index fd21f14dbf..491eb5741b 100644 --- a/gtk/rtp_player.c +++ b/gtk/rtp_player.c @@ -917,29 +917,29 @@ static void draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index) { #if PORTAUDIO_API_1 - PaTimestamp index; + PaTimestamp idx; #else /* PORTAUDIO_API_1 */ - PaTime index; + PaTime idx; #endif /* PORTAUDIO_API_1 */ int i; if (!rci) return; #if PORTAUDIO_API_1 - index = Pa_StreamTime( pa_stream ) - rtp_channels->pause_duration - rtp_channels->out_diff_time - start_index; + idx = Pa_StreamTime( pa_stream ) - rtp_channels->pause_duration - rtp_channels->out_diff_time - start_index; #else /* PORTAUDIO_API_1 */ - index = ((guint32)(SAMPLE_RATE) * (Pa_GetStreamTime(pa_stream)-rtp_channels->pa_start_time))- rtp_channels->pause_duration - rtp_channels->out_diff_time - start_index; + idx = ((guint32)(SAMPLE_RATE) * (Pa_GetStreamTime(pa_stream)-rtp_channels->pa_start_time))- rtp_channels->pause_duration - rtp_channels->out_diff_time - start_index; #endif /* PORTAUDIO_API_1 */ /* If we finished playing both channels, then stop them */ - if ( (rtp_channels && (!rtp_channels->stop) && (!rtp_channels->pause)) && (index > rtp_channels->max_frame_index) ) { + if ( (rtp_channels && (!rtp_channels->stop) && (!rtp_channels->pause)) && (idx > rtp_channels->max_frame_index) ) { stop_channels(); return; } /* If only this channel finished, then return */ - if (index > rci->max_frame_index) { + if (idx > rci->max_frame_index) { return; } @@ -959,20 +959,20 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index) rci->cursor_pixbuf = NULL; } - if (index>0 && (rci->cursor_prev>=0)) { - rci->cursor_pixbuf = gdk_pixbuf_get_from_drawable(NULL, rci->pixmap, NULL, (int) (index/MULT), 0, 0, 0, 1, rci->draw_area->allocation.height-HEIGHT_TIME_LABEL); + if (idx>0 && (rci->cursor_prev>=0)) { + rci->cursor_pixbuf = gdk_pixbuf_get_from_drawable(NULL, rci->pixmap, NULL, (int) (idx/MULT), 0, 0, 0, 1, rci->draw_area->allocation.height-HEIGHT_TIME_LABEL); gdk_draw_line(rci->pixmap, rci->draw_area->style->black_gc, - (int) (index/MULT), + (int) (idx/MULT), 0, - (int) (index/MULT), + (int) (idx/MULT), rci->draw_area->allocation.height-HEIGHT_TIME_LABEL); gdk_draw_drawable(rci->draw_area->window, rci->draw_area->style->fg_gc[GTK_WIDGET_STATE(rci->draw_area)], rci->pixmap, - (int) (index/MULT), 0, - (int) (index/MULT), 0, + (int) (idx/MULT), 0, + (int) (idx/MULT), 0, 1, rci->draw_area->allocation.height-HEIGHT_TIME_LABEL); } @@ -982,7 +982,7 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index) /* Move the horizontal scroll bar */ #if 0 if ( (rci->cursor_prev/MULT < (rci->h_scrollbar_adjustment->value+rci->h_scrollbar_adjustment->page_increment)) && - (index/MULT >= (rci->h_scrollbar_adjustment->value+rci->h_scrollbar_adjustment->page_increment)) ){ + (idx/MULT >= (rci->h_scrollbar_adjustment->value+rci->h_scrollbar_adjustment->page_increment)) ){ for (i=1; i<10; i++) { rci->h_scrollbar_adjustment->value += rci->h_scrollbar_adjustment->page_size/10; gtk_adjustment_value_changed(rci->h_scrollbar_adjustment); @@ -990,17 +990,17 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index) } #endif if (!rci->cursor_catch) { - if (index/MULT < rci->h_scrollbar_adjustment->page_size/2) { + if (idx/MULT < rci->h_scrollbar_adjustment->page_size/2) { rci->h_scrollbar_adjustment->value = rci->h_scrollbar_adjustment->lower; - } else if (index/MULT > (rci->h_scrollbar_adjustment->upper - rci->h_scrollbar_adjustment->page_size/2)) { + } else if (idx/MULT > (rci->h_scrollbar_adjustment->upper - rci->h_scrollbar_adjustment->page_size/2)) { rci->h_scrollbar_adjustment->value = rci->h_scrollbar_adjustment->upper - rci->h_scrollbar_adjustment->page_size; } else { - rci->h_scrollbar_adjustment->value = index/MULT - rci->h_scrollbar_adjustment->page_size/2; + rci->h_scrollbar_adjustment->value = idx/MULT - rci->h_scrollbar_adjustment->page_size/2; } gtk_adjustment_value_changed(rci->h_scrollbar_adjustment); } else if ( (rci->cursor_prev/MULT < (rci->h_scrollbar_adjustment->value+rci->h_scrollbar_adjustment->page_increment)) && - (index/MULT >= (rci->h_scrollbar_adjustment->value+rci->h_scrollbar_adjustment->page_increment)) ){ + (idx/MULT >= (rci->h_scrollbar_adjustment->value+rci->h_scrollbar_adjustment->page_increment)) ){ rci->cursor_catch = FALSE; for (i=1; i<10; i++) { rci->h_scrollbar_adjustment->value = min(rci->h_scrollbar_adjustment->upper-rci->h_scrollbar_adjustment->page_size, rci->h_scrollbar_adjustment->value + (rci->h_scrollbar_adjustment->page_size/20)); @@ -1014,31 +1014,31 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index) g_signal_connect(rci->h_scrollbar_adjustment, "value_changed", G_CALLBACK(h_scrollbar_changed), rci); #if 0 - if (index/MULT < rci->h_scrollbar_adjustment->page_increment) { + if (idx/MULT < rci->h_scrollbar_adjustment->page_increment) { rci->h_scrollbar_adjustment->value = rci->h_scrollbar_adjustment->lower; - } else if (index/MULT > (rci->h_scrollbar_adjustment->upper - rci->h_scrollbar_adjustment->page_size + rci->h_scrollbar_adjustment->page_increment)) { + } else if (idx/MULT > (rci->h_scrollbar_adjustment->upper - rci->h_scrollbar_adjustment->page_size + rci->h_scrollbar_adjustment->page_increment)) { rci->h_scrollbar_adjustment->value = rci->h_scrollbar_adjustment->upper - rci->h_scrollbar_adjustment->page_size; } else { - if ( (index/MULT < rci->h_scrollbar_adjustment->value) || (index/MULT > (rci->h_scrollbar_adjustment->value+rci->h_scrollbar_adjustment->page_increment)) ){ - rci->h_scrollbar_adjustment->value = index/MULT; + if ( (idx/MULT < rci->h_scrollbar_adjustment->value) || (idx/MULT > (rci->h_scrollbar_adjustment->value+rci->h_scrollbar_adjustment->page_increment)) ){ + rci->h_scrollbar_adjustment->value = idx/MULT; } } #endif #if 0 - if (index/MULT < rci->h_scrollbar_adjustment->page_size/2) { + if (idx/MULT < rci->h_scrollbar_adjustment->page_size/2) { rci->h_scrollbar_adjustment->value = rci->h_scrollbar_adjustment->lower; - } else if (index/MULT > (rci->h_scrollbar_adjustment->upper - rci->h_scrollbar_adjustment->page_size/2)) { + } else if (idx/MULT > (rci->h_scrollbar_adjustment->upper - rci->h_scrollbar_adjustment->page_size/2)) { rci->h_scrollbar_adjustment->value = rci->h_scrollbar_adjustment->upper - rci->h_scrollbar_adjustment->page_size; } else { - rci->h_scrollbar_adjustment->value = index/MULT - rci->h_scrollbar_adjustment->page_size/2; + rci->h_scrollbar_adjustment->value = idx/MULT - rci->h_scrollbar_adjustment->page_size/2; } #endif #if 0 gtk_adjustment_value_changed(rci->h_scrollbar_adjustment); #endif - rci->cursor_prev = index; + rci->cursor_prev = idx; } /****************************************************************************/ diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c index 2d1e802a2d..75d296ef93 100644 --- a/gtk/sctp_byte_graph_dlg.c +++ b/gtk/sctp_byte_graph_dlg.c @@ -726,7 +726,7 @@ on_zoomin_bt (GtkWidget *widget _U_, struct sctp_udata *u_data) } static void -zoomin_bt (struct sctp_udata *u_data) +zoomin_bt_fcn (struct sctp_udata *u_data) { sctp_min_max_t *tmp_minmax; @@ -946,7 +946,7 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda u_data->io->rectangle_present=FALSE; if (event->x >= u_data->io->rect_x_min && event->x <= u_data->io->rect_x_max && event->y >= u_data->io->rect_y_min && event->y <= u_data->io->rect_y_max) - zoomin_bt(u_data); + zoomin_bt_fcn(u_data); else { u_data->io->x1_tmp_sec = u_data->io->x1_akt_sec; diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c index 5616deee6d..b04f286f27 100644 --- a/gtk/sctp_graph_dlg.c +++ b/gtk/sctp_graph_dlg.c @@ -1035,7 +1035,7 @@ on_zoomin_bt (GtkWidget *widget _U_, struct sctp_udata *u_data) } static void -zoomin_bt (struct sctp_udata *u_data) +zoomin_bt_fcn (struct sctp_udata *u_data) { sctp_min_max_t *tmp_minmax; @@ -1256,7 +1256,7 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda u_data->io->rectangle_present=FALSE; if (event->x >= u_data->io->rect_x_min && event->x <= u_data->io->rect_x_max && event->y >= u_data->io->rect_y_min && event->y <= u_data->io->rect_y_max) - zoomin_bt(u_data); + zoomin_bt_fcn(u_data); else { u_data->io->x1_tmp_sec = u_data->io->x1_akt_sec; diff --git a/gtk/sctp_stat.c b/gtk/sctp_stat.c index bb914d724f..a67bbade04 100644 --- a/gtk/sctp_stat.c +++ b/gtk/sctp_stat.c @@ -563,7 +563,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v struct tsn_sort *tsn_s; guint8* addr = NULL; int i; - guint8 index = 0; + guint8 idx = 0; sctp_allassocs_info_t *assoc_info=NULL; assoc_info = &sctp_tapinfo_struct; @@ -790,13 +790,13 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v info->initack = TRUE; } - index = tvb_get_guint8(sctp_info->tvb[0],0); - if (index > UPPER_BOUND_CHUNK_TYPE) - index = OTHER_CHUNKS_INDEX; + idx = tvb_get_guint8(sctp_info->tvb[0],0); + if (idx > UPPER_BOUND_CHUNK_TYPE) + idx = OTHER_CHUNKS_INDEX; - info->chunk_count[index]++; - info->ep1_chunk_count[index]++; - info = add_chunk_count(&tmp_info.src, info, 1, index); + info->chunk_count[idx]++; + info->ep1_chunk_count[idx]++; + info = add_chunk_count(&tmp_info.src, info, 1, idx); } else { @@ -815,13 +815,13 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v } for (chunk_number = 0; chunk_number < sctp_info->number_of_tvbs; chunk_number++) { - index = tvb_get_guint8(sctp_info->tvb[0],0); - if ( index > UPPER_BOUND_CHUNK_TYPE ) - index = OTHER_CHUNKS_INDEX; + idx = tvb_get_guint8(sctp_info->tvb[0],0); + if ( idx > UPPER_BOUND_CHUNK_TYPE ) + idx = OTHER_CHUNKS_INDEX; - info->chunk_count[index]++; - info->ep1_chunk_count[index]++; - info = add_chunk_count(&tmp_info.src, info, 1, index); + info->chunk_count[idx]++; + info->ep1_chunk_count[idx]++; + info = add_chunk_count(&tmp_info.src, info, 1, idx); if (tvb_get_guint8(sctp_info->tvb[chunk_number],0) == SCTP_DATA_CHUNK_ID) { @@ -1063,15 +1063,15 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v info->tsn1 = g_list_prepend(info->tsn1, tsn); } - index = tvb_get_guint8(sctp_info->tvb[0],0); - if (index > UPPER_BOUND_CHUNK_TYPE) - index = OTHER_CHUNKS_INDEX; - info->chunk_count[index]++; + idx = tvb_get_guint8(sctp_info->tvb[0],0); + if (idx > UPPER_BOUND_CHUNK_TYPE) + idx = OTHER_CHUNKS_INDEX; + info->chunk_count[idx]++; if (info->direction == 1) - info->ep1_chunk_count[index]++; + info->ep1_chunk_count[idx]++; else - info->ep2_chunk_count[index]++; - info = add_chunk_count(&tmp_info.src, info, info->direction, index); + info->ep2_chunk_count[idx]++; + info = add_chunk_count(&tmp_info.src, info, info->direction, idx); for (chunk_number = 1; chunk_number < sctp_info->number_of_tvbs; chunk_number++) { type = tvb_get_ntohs(sctp_info->tvb[chunk_number],0); @@ -1121,16 +1121,16 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v } for (chunk_number = 0; chunk_number < sctp_info->number_of_tvbs; chunk_number++) { - index = tvb_get_guint8(sctp_info->tvb[chunk_number],0); - if (index > UPPER_BOUND_CHUNK_TYPE) - index = OTHER_CHUNKS_INDEX; + idx = tvb_get_guint8(sctp_info->tvb[chunk_number],0); + if (idx > UPPER_BOUND_CHUNK_TYPE) + idx = OTHER_CHUNKS_INDEX; - info->chunk_count[index]++; + info->chunk_count[idx]++; if (info->direction == 1) - info->ep1_chunk_count[index]++; + info->ep1_chunk_count[idx]++; else - info->ep2_chunk_count[index]++; - info = add_chunk_count(&tmp_info.src, info,info->direction, index); + info->ep2_chunk_count[idx]++; + info = add_chunk_count(&tmp_info.src, info,info->direction, idx); if ((tvb_get_guint8(sctp_info->tvb[chunk_number],0)) == SCTP_DATA_CHUNK_ID) { @@ -77,7 +77,7 @@ gboolean u3_active() void u3_runtime_info(GString *str) { - char *u3devicepath = NULL; + char *u3devicepath_lcl = NULL; char *u3deviceproduct = NULL; if((u3deviceproduct = @@ -95,7 +95,7 @@ void u3_runtime_info(GString *str) g_string_append(str, " U3 device"); - if((u3devicepath = + if((u3devicepath_lcl = #ifdef _WIN32 getenv_utf8 #else @@ -103,7 +103,7 @@ void u3_runtime_info(GString *str) #endif ("U3_DEVICE_PATH")) != NULL) { g_string_append(str, " in drive "); - g_string_append(str, u3devicepath); + g_string_append(str, u3devicepath_lcl); } } diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c index f917206462..15891ecf6b 100644 --- a/gtk/uat_gui.c +++ b/gtk/uat_gui.c @@ -472,15 +472,15 @@ static void uat_edit_dialog(uat_t* uat, gint row) { } case PT_TXTMOD_ENUM: { GtkWidget *menu, *option_menu; - int menu_index, index; + int menu_idx, idx; const value_string* enum_vals = f[colnum].fld_data; void* valptr = g_malloc0(sizeof(void*)); menu = gtk_menu_new(); - menu_index = -1; - for (index = 0; enum_vals[index].strptr != NULL; index++) { + menu_idx = -1; + for (idx = 0; enum_vals[idx].strptr != NULL; idx++) { struct _fld_menu_item_data_t* md = g_malloc(sizeof(struct _fld_menu_item_data_t)); - const char* str = enum_vals[index].strptr; + const char* str = enum_vals[idx].strptr; GtkWidget* menu_item = gtk_menu_item_new_with_label(str); md->text = str; @@ -489,7 +489,7 @@ static void uat_edit_dialog(uat_t* uat, gint row) { gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); if ( g_str_equal(str, text) ) { - menu_index = index; + menu_idx = idx; *((char const**)valptr) = str; } @@ -505,8 +505,8 @@ static void uat_edit_dialog(uat_t* uat, gint row) { gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu); /* Set its current value to the variable's current value */ - if (menu_index != -1) - gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), menu_index); + if (menu_idx != -1) + gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), menu_idx); gtk_table_attach_defaults(GTK_TABLE(main_tb), option_menu, 1, 2, colnum+1, colnum + 2); diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c index 355346c966..cd0f2e4f75 100644 --- a/gtk/voip_calls.c +++ b/gtk/voip_calls.c @@ -338,7 +338,7 @@ static guint change_call_num_graph(voip_calls_tapinfo_t *tapinfo _U_, guint16 ca /****************************************************************************/ /* Insert the item in the graph list */ -void insert_to_graph(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, const gchar *frame_label, const gchar *comment, guint16 call_num, address *src_addr, address *dst_addr, guint16 line_style, double time, guint32 frame_num) +void insert_to_graph(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, const gchar *frame_label, const gchar *comment, guint16 call_num, address *src_addr, address *dst_addr, guint16 line_style, double time_val, guint32 frame_num) { graph_analysis_item_t *gai, *new_gai; GList *list; @@ -347,7 +347,7 @@ void insert_to_graph(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, cons new_gai = g_malloc(sizeof(graph_analysis_item_t)); new_gai->frame_num = frame_num; - new_gai->time= time; + new_gai->time= time_val; COPY_ADDRESS(&(new_gai->src_addr),src_addr); COPY_ADDRESS(&(new_gai->dst_addr),dst_addr); @@ -2227,7 +2227,7 @@ remove_tap_listener_sdp_calls(void) This function will look for a signal/event in the SignalReq/ObsEvent string and return true if it is found */ -static gboolean isSignal(const gchar *signal, const gchar *signalStr) +static gboolean isSignal(const gchar *signal_str_p, const gchar *signalStr) { gint i; gchar **resultArray; @@ -2236,14 +2236,14 @@ static gboolean isSignal(const gchar *signal, const gchar *signalStr) if (signalStr == NULL) return FALSE; /* if are both "blank" return true */ - if ( (*signal == '\0') && (*signalStr == '\0') ) return TRUE; + if ( (*signal_str_p == '\0') && (*signalStr == '\0') ) return TRUE; - /* look for signal in signalSre */ + /* look for signal in signalStr */ resultArray = g_strsplit(signalStr, ",", 10); for (i = 0; resultArray[i]; i++) { g_strstrip(resultArray[i]); - if (strcmp(resultArray[i], signal) == 0) return TRUE; + if (strcmp(resultArray[i], signal_str_p) == 0) return TRUE; } g_strfreev(resultArray); |