diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2015-07-02 12:19:02 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-07-02 15:28:03 +0000 |
| commit | 9421af309bcb02a89c7a7d14dcc095afa7c56604 (patch) | |
| tree | 0f9ebcaf13731de2bd2c22ebe38ca1fec3e29d1b /ui/gtk/capture_dlg.c | |
| parent | 523ce152e82357f67b3cf72b061f92d8dbcc2396 (diff) | |
Try to fix: warning C6244: Local declaration of 'airpcap_if_list' hides
previous declaration.
Change-Id: Id0c3b74ac52c427d9c1efdf749dc410bc5bb450f
Reviewed-on: https://code.wireshark.org/review/9460
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/capture_dlg.c')
| -rw-r--r-- | ui/gtk/capture_dlg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c index 1f3469c163..80c848ef4f 100644 --- a/ui/gtk/capture_dlg.c +++ b/ui/gtk/capture_dlg.c @@ -2985,7 +2985,7 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum * confuse users, so that they ask why this is grayed out on * their non-Windows machine and ask how to enable it. */ - airpcap_if_selected = get_airpcap_if_from_name(airpcap_if_list, device.name); + airpcap_if_selected = get_airpcap_if_from_name(g_airpcap_if_list, device.name); if (airpcap_if_selected != NULL) { advanced_bt = gtk_button_new_with_label("Wireless Settings"); @@ -4604,13 +4604,13 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* update airpcap interface list */ /* load the airpcap interfaces */ - airpcap_if_list = get_airpcap_interface_list(&err, &err_str); + g_airpcap_if_list = get_airpcap_interface_list(&err, &err_str); /* If we don't get a list don't do any thing. * If the error is AIRPCAP_NOT_LOADED it avoids an unnecessary rescan of the packet list * ( see airpcap_loader.h for error codes). */ - if (airpcap_if_list == NULL) { + if (g_airpcap_if_list == NULL) { if (err == CANT_GET_AIRPCAP_INTERFACE_LIST) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_str); g_free(err_str); @@ -4620,7 +4620,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* XXXX update_decryption_mode_list() triggers a rescan, should only be done if the mode is changed */ update_decryption_mode_list(decryption_cb); /* select the first as default (THIS SHOULD BE CHANGED) */ - airpcap_if_active = airpcap_get_default_if(airpcap_if_list); + airpcap_if_active = airpcap_get_default_if(g_airpcap_if_list); } #endif |