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 /caputils | |
| 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 'caputils')
| -rw-r--r-- | caputils/airpcap_loader.c | 6 | ||||
| -rw-r--r-- | caputils/airpcap_loader.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/caputils/airpcap_loader.c b/caputils/airpcap_loader.c index 61818ba0f5..299cac1483 100644 --- a/caputils/airpcap_loader.c +++ b/caputils/airpcap_loader.c @@ -98,7 +98,7 @@ static AirpcapGetDeviceChannelExHandler g_PAirpcapGetDeviceChannelEx; static AirpcapGetDeviceSupportedChannelsHandler g_PAirpcapGetDeviceSupportedChannels; /* Airpcap interface list */ -GList *airpcap_if_list = NULL; +GList *g_airpcap_if_list = NULL; /* Airpcap current selected interface */ airpcap_if_info_t *airpcap_if_selected = NULL; @@ -601,14 +601,14 @@ airpcap_driver_fake_if_info_new(void) airpcap_if_info_t *fake_if_info = NULL; /* Maybe for some reason no airpcap adapter is found */ - if (airpcap_if_list == NULL) + if (g_airpcap_if_list == NULL) return NULL; /* * Retrieve the first AirPcap adapter available. If no interface is found, * it is not possible to retrieve the driver's settings, so return NULL. */ - if_info = (airpcap_if_info_t *)g_list_nth_data(airpcap_if_list,0); + if_info = (airpcap_if_info_t *)g_list_nth_data(g_airpcap_if_list,0); if (if_info == NULL) return NULL; diff --git a/caputils/airpcap_loader.h b/caputils/airpcap_loader.h index 9eea487b02..034f732de1 100644 --- a/caputils/airpcap_loader.h +++ b/caputils/airpcap_loader.h @@ -135,7 +135,7 @@ typedef struct { } keys_cb_data_t; /* Airpcap interface list */ -extern GList *airpcap_if_list; +extern GList *g_airpcap_if_list; /* Airpcap current selected interface */ extern airpcap_if_info_t *airpcap_if_selected; |