Fix a [-Wshadow] warning;

 Also: Do some minor whitespace and formatting changes.

svn path=/trunk/; revision=46186

1 files changed, 28 insertions, 28 deletions

diff --git a/ui/gtk/main_airpcap_toolbar.c b/ui/gtk/main_airpcap_toolbar.c
index 84820af8cb..7db4ff2163 100644
--- a/ui/gtk/main_airpcap_toolbar.c
+++ b/ui/gtk/main_airpcap_toolbar.c
@@ -186,7 +186,7 @@ GtkWidget *airpcap_toolbar_new(void)
                   *channel_offset_cb = NULL,
                   *fcs_filter_lb = NULL,
                   *fcs_filter_cb = NULL;
-    GtkWidget     *wireless_tb;
+    GtkWidget     *lcl_wireless_tb;
 
     GtkWidget     *decryption_mode_lb;
     GtkWidget     *decryption_mode_cb;
@@ -196,25 +196,25 @@ GtkWidget *airpcap_toolbar_new(void)
                   *tool_item;
 
     /* airpcap toolbar */
-    wireless_tb = gtk_toolbar_new();
-    gtk_orientable_set_orientation(GTK_ORIENTABLE(wireless_tb),
+    lcl_wireless_tb = gtk_toolbar_new();
+    gtk_orientable_set_orientation(GTK_ORIENTABLE(lcl_wireless_tb),
                                 GTK_ORIENTATION_HORIZONTAL);
 
     /* Create the "802.11 Channel:" label */
     channel_lb = gtk_label_new("802.11 Channel: ");
-    g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY, channel_lb);
+    g_object_set_data(G_OBJECT(lcl_wireless_tb), AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY, channel_lb);
     gtk_widget_show(channel_lb);
 
     tool_item = gtk_tool_item_new ();
     gtk_container_add (GTK_CONTAINER (tool_item), channel_lb);
     gtk_widget_show (GTK_WIDGET (tool_item));
-    gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
+    gtk_toolbar_insert(GTK_TOOLBAR(lcl_wireless_tb), tool_item, -1);
 
     gtk_widget_set_tooltip_text(GTK_WIDGET(tool_item), "Current 802.11 Channel");
 
     /* Create the channel combo box */
     channel_cb = gtk_combo_box_text_new();
-    g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_CHANNEL_KEY, channel_cb);
+    g_object_set_data(G_OBJECT(lcl_wireless_tb), AIRPCAP_TOOLBAR_CHANNEL_KEY, channel_cb);
 
     /* Select the current channel */
     airpcap_update_channel_combo(GTK_WIDGET(channel_cb), airpcap_if_selected);
@@ -224,25 +224,25 @@ GtkWidget *airpcap_toolbar_new(void)
     tool_item = gtk_tool_item_new ();
     gtk_container_add (GTK_CONTAINER (tool_item), channel_cb);
     gtk_widget_show (GTK_WIDGET (tool_item));
-    gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
+    gtk_toolbar_insert(GTK_TOOLBAR(lcl_wireless_tb), tool_item, -1);
 
     gtk_widget_set_tooltip_text(GTK_WIDGET(tool_item), "802.11 Channel");
 
     /* Create the "Channel Offset:" label */
     channel_offset_lb = gtk_label_new("Channel Offset: ");
-    g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY, channel_offset_lb);
+    g_object_set_data(G_OBJECT(lcl_wireless_tb), AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY, channel_offset_lb);
     gtk_widget_show(channel_offset_lb);
 
     tool_item = gtk_tool_item_new ();
     gtk_container_add (GTK_CONTAINER (tool_item), channel_offset_lb);
     gtk_widget_show (GTK_WIDGET (tool_item));
-    gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
+    gtk_toolbar_insert(GTK_TOOLBAR(lcl_wireless_tb), tool_item, -1);
 
     gtk_widget_set_tooltip_text(GTK_WIDGET(tool_item), "Current 802.11 Channel Offset");
 
     /* Start: Channel offset combo box */
     channel_offset_cb = gtk_combo_box_text_new();
-    g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY, channel_offset_cb);
+    g_object_set_data(G_OBJECT(lcl_wireless_tb), AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY, channel_offset_cb);
 
     if(airpcap_if_active != NULL){
         airpcap_update_channel_offset_combo(airpcap_if_active, airpcap_if_active->channelInfo.Frequency, channel_offset_cb, FALSE);
@@ -257,7 +257,7 @@ GtkWidget *airpcap_toolbar_new(void)
     tool_item = gtk_tool_item_new ();
     gtk_container_add (GTK_CONTAINER (tool_item), channel_offset_cb);
     gtk_widget_show (GTK_WIDGET (tool_item));
-    gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
+    gtk_toolbar_insert(GTK_TOOLBAR(lcl_wireless_tb), tool_item, -1);
 
     /* callback for channel combo box */
     g_signal_connect(channel_cb,"changed", G_CALLBACK(airpcap_channel_changed_set_cb), channel_offset_cb);
@@ -267,16 +267,16 @@ GtkWidget *airpcap_toolbar_new(void)
 
     /* Wrong CRC Label */
     fcs_filter_lb = gtk_label_new(" FCS Filter: ");
-    g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY, fcs_filter_lb);
+    g_object_set_data(G_OBJECT(lcl_wireless_tb), AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY, fcs_filter_lb);
     gtk_widget_show(fcs_filter_lb);
     tool_item = gtk_tool_item_new ();
     gtk_container_add (GTK_CONTAINER (tool_item), fcs_filter_lb);
     gtk_widget_show (GTK_WIDGET (tool_item));
-    gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
+    gtk_toolbar_insert(GTK_TOOLBAR(lcl_wireless_tb), tool_item, -1);
 
     /* FCS filter combo box */
     fcs_filter_cb = gtk_combo_box_text_new();
-    g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_FCS_FILTER_KEY, fcs_filter_cb);
+    g_object_set_data(G_OBJECT(lcl_wireless_tb), AIRPCAP_TOOLBAR_FCS_FILTER_KEY, fcs_filter_cb);
 
     gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(fcs_filter_cb), airpcap_get_validation_name(AIRPCAP_VT_ACCEPT_EVERYTHING));
     gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(fcs_filter_cb), airpcap_get_validation_name(AIRPCAP_VT_ACCEPT_CORRECT_FRAMES));
@@ -295,11 +295,11 @@ GtkWidget *airpcap_toolbar_new(void)
     tool_item = gtk_tool_item_new ();
     gtk_container_add (GTK_CONTAINER (tool_item), fcs_filter_cb);
     gtk_widget_show (GTK_WIDGET (tool_item));
-    gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
+    gtk_toolbar_insert(GTK_TOOLBAR(lcl_wireless_tb), tool_item, -1);
 
     /* Decryption mode combo box */
     decryption_mode_lb = gtk_label_new ("Decryption Mode: ");
-    g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_DECRYPTION_LABEL_KEY, decryption_mode_lb);
+    g_object_set_data(G_OBJECT(lcl_wireless_tb), AIRPCAP_TOOLBAR_DECRYPTION_LABEL_KEY, decryption_mode_lb);
     gtk_widget_set_name (decryption_mode_lb, "decryption_mode_lb");
     gtk_widget_show (decryption_mode_lb);
 
@@ -311,45 +311,45 @@ GtkWidget *airpcap_toolbar_new(void)
     tool_item = gtk_tool_item_new ();
     gtk_container_add (GTK_CONTAINER (tool_item), decryption_mode_cb);
     gtk_widget_show (GTK_WIDGET (tool_item));
-    gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), tool_item, -1);
+    gtk_toolbar_insert(GTK_TOOLBAR(lcl_wireless_tb), tool_item, -1);
 
     gtk_widget_set_tooltip_text(fcs_filter_lb, "Choose a Decryption Mode");
     /* Set current decryption mode!!!! */
     update_decryption_mode(decryption_mode_cb);
     g_signal_connect(decryption_mode_cb, "changed", G_CALLBACK(on_decryption_mode_cb_changed), NULL);
-    g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_DECRYPTION_KEY, decryption_mode_cb);
+    g_object_set_data(G_OBJECT(lcl_wireless_tb), AIRPCAP_TOOLBAR_DECRYPTION_KEY, decryption_mode_cb);
 
     /* Advanced button */
     advanced_bt = gtk_tool_button_new(NULL, /* a widget that will be used as icon widget, or NULL */
                                       "Wireless Settings...");
-    g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_ADVANCED_KEY, advanced_bt);
+    g_object_set_data(G_OBJECT(lcl_wireless_tb), AIRPCAP_TOOLBAR_ADVANCED_KEY, advanced_bt);
 
-    g_signal_connect(advanced_bt, "clicked", G_CALLBACK(toolbar_display_airpcap_advanced_cb), wireless_tb);
+    g_signal_connect(advanced_bt, "clicked", G_CALLBACK(toolbar_display_airpcap_advanced_cb), lcl_wireless_tb);
     gtk_widget_show(GTK_WIDGET(advanced_bt));
-    gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), advanced_bt, -1);
+    gtk_toolbar_insert(GTK_TOOLBAR(lcl_wireless_tb), advanced_bt, -1);
 
     gtk_widget_set_tooltip_text(GTK_WIDGET(advanced_bt), "Set Advanced Wireless Settings");
     /* Key Management button */
     key_management_bt = gtk_tool_button_new(NULL, /* a widget that will be used as icon widget, or NULL */
                                             "Decryption Keys...");
 
-    g_object_set_data(G_OBJECT(wireless_tb), AIRPCAP_TOOLBAR_KEY_MANAGEMENT_KEY, key_management_bt);
+    g_object_set_data(G_OBJECT(lcl_wireless_tb), AIRPCAP_TOOLBAR_KEY_MANAGEMENT_KEY, key_management_bt);
 
-    g_signal_connect(key_management_bt, "clicked", G_CALLBACK(toolbar_display_airpcap_key_management_cb), wireless_tb);
+    g_signal_connect(key_management_bt, "clicked", G_CALLBACK(toolbar_display_airpcap_key_management_cb), lcl_wireless_tb);
     gtk_widget_show(GTK_WIDGET(key_management_bt));
-    gtk_toolbar_insert(GTK_TOOLBAR(wireless_tb), key_management_bt, -1);
+    gtk_toolbar_insert(GTK_TOOLBAR(lcl_wireless_tb), key_management_bt, -1);
     gtk_widget_set_tooltip_text(GTK_WIDGET(key_management_bt), "Manage Decryption Keys");
 
     /* If no airpcap interface is present, gray everything */
     if(airpcap_if_active == NULL) {
         if(airpcap_if_list == NULL || g_list_length(airpcap_if_list) == 0) {
             /* No airpcap device found */
-            airpcap_enable_toolbar_widgets(wireless_tb, FALSE);
+            airpcap_enable_toolbar_widgets(lcl_wireless_tb, FALSE);
             /* recent.airpcap_toolbar_show = TRUE; */
         } else {
             /* default adapter is not airpcap... or is airpcap but is not found*/
             airpcap_set_toolbar_stop_capture(airpcap_if_active);
-            airpcap_enable_toolbar_widgets(wireless_tb, FALSE);
+            airpcap_enable_toolbar_widgets(lcl_wireless_tb, FALSE);
             /* recent.airpcap_toolbar_show = TRUE; */
         }
     } else {
@@ -357,7 +357,7 @@ GtkWidget *airpcap_toolbar_new(void)
         /* recent.airpcap_toolbar_show = TRUE; */
     }
 
-    return wireless_tb;
+    return lcl_wireless_tb;
 }
 
 static void
@@ -369,7 +369,7 @@ driver_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
     recent.airpcap_driver_check_show = !r;
 }
 
-void airpcap_toolbar_show(GtkWidget *wireless_tb _U_)
+void airpcap_toolbar_show(GtkWidget *lcl_wireless_tb _U_)
 {
   /*
    * This will read the decryption keys from the preferences file, and will