aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/main_80211_toolbar.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2012-12-05 15:56:36 +0000
committerBill Meier <wmeier@newsguy.com>2012-12-05 15:56:36 +0000
commit7cd0417af555a78b19c6909a40d1867e0fe9a063 (patch)
treecc09f739029479eee683f26228e098db307fd1aa /ui/gtk/main_80211_toolbar.c
parentf8ba6b5a077fa89f1d1e55b5bed4bab0ea6b11cf (diff)
downloadwireshark-7cd0417af555a78b19c6909a40d1867e0fe9a063.tar.gz
wireshark-7cd0417af555a78b19c6909a40d1867e0fe9a063.tar.bz2
wireshark-7cd0417af555a78b19c6909a40d1867e0fe9a063.zip
Fix numerous instances of a variable/parameter name "shadowing" a library function name;
(At least some (gcc ?) compilers give a "shadow" warning for these). svn path=/trunk/; revision=46402
Diffstat (limited to 'ui/gtk/main_80211_toolbar.c')
-rw-r--r--ui/gtk/main_80211_toolbar.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c
index 557ba072d7..67fe847bb5 100644
--- a/ui/gtk/main_80211_toolbar.c
+++ b/ui/gtk/main_80211_toolbar.c
@@ -63,12 +63,12 @@ static void tb80211_set_info(char *errstr)
}
static
-void add_channel_type(char *type, int oldtype, int index )
+void add_channel_type(char *type, int oldtype, int indx )
{
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(tb80211_chan_type_box), type);
if (oldtype != -1 && oldtype == ws80211_str_to_chan_type(type)) {
- gtk_combo_box_set_active(GTK_COMBO_BOX(tb80211_chan_type_box), index);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(tb80211_chan_type_box), indx);
tb80211_current_type = oldtype;
}
}