osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix a [-Wshadow] warning; 

Also: Do some minor whitespace and formatting changes.

svn path=/trunk/; revision=46187
This commit is contained in:
Bill Meier 2012-11-25 21:47:04 +00:00
parent 6f08979550
commit f22b7d2993
1 changed files with 763 additions and 763 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airpcap_loader.c
View File

@ -1578,13 +1578,13 @@ airpcap_get_if_string_number_from_description(gchar* description)
* Returns the default airpcap interface of a list, NULL if list is empty
*/
airpcap_if_info_t*
airpcap_get_default_if(GList* airpcap_if_list)
airpcap_get_default_if(GList* airpcap_if_list_p)
{
airpcap_if_info_t* if_info = NULL;
if ((prefs.capture_device != NULL) && (*prefs.capture_device != '\0'))
{
if_info = get_airpcap_if_from_name(airpcap_if_list,
if_info = get_airpcap_if_from_name(airpcap_if_list_p,
get_if_name(prefs.capture_device));
}
return if_info;
@ -2119,7 +2119,7 @@ keys_are_equals(decryption_key_t *k1,decryption_key_t *k2)
if (g_string_equal(k1->key,k2->key) &&
(k1->bits == k2->bits) && /* If the previous is TRUE, this must be TRUE as well */
k1->type == k2->type)
(k1->type == k2->type))
{
/* Check the ssid... if the key type is WEP, the two fields should be NULL */
if ((k1->ssid == NULL) && (k2->ssid == NULL))