diff options
| author | Evan Huus <eapache@gmail.com> | 2013-09-22 20:01:32 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-09-22 20:01:32 +0000 |
| commit | 1210a335abc6bf74068d3020252f25f714ff5ee2 (patch) | |
| tree | 7be93664fa8b1c9075dddff23ef7799e1053f004 /epan/addr_resolv.c | |
| parent | 6aa5e30ed9f8fe4cb5b1cd68ac36b76e7c775acc (diff) | |
| download | wireshark-1210a335abc6bf74068d3020252f25f714ff5ee2.tar.gz wireshark-1210a335abc6bf74068d3020252f25f714ff5ee2.tar.bz2 wireshark-1210a335abc6bf74068d3020252f25f714ff5ee2.zip | |
Fix -Wshadow, indentation
svn path=/trunk/; revision=52179
Diffstat (limited to 'epan/addr_resolv.c')
| -rw-r--r-- | epan/addr_resolv.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 8c7d71575f..5d975cd4dc 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -2182,37 +2182,37 @@ add_ip_name_from_string (const char *addr, const char *name) static void ipv4_hash_table_resolved_to_list(gpointer key _U_, gpointer value, gpointer user_data) { - addrinfo_lists_t *addrinfo_lists = (addrinfo_lists_t*)user_data; - hashipv4_t *ipv4_hash_table_entry = (hashipv4_t *)value; + addrinfo_lists_t *lists = (addrinfo_lists_t*)user_data; + hashipv4_t *ipv4_hash_table_entry = (hashipv4_t *)value; - if(!ipv4_hash_table_entry->is_dummy_entry){ - addrinfo_lists->ipv4_addr_list = g_list_prepend (addrinfo_lists->ipv4_addr_list, ipv4_hash_table_entry); - } + if(!ipv4_hash_table_entry->is_dummy_entry){ + lists->ipv4_addr_list = g_list_prepend (lists->ipv4_addr_list, ipv4_hash_table_entry); + } } static void ipv6_hash_table_resolved_to_list(gpointer key _U_, gpointer value, gpointer user_data) { - addrinfo_lists_t *addrinfo_lists = (addrinfo_lists_t*)user_data; + addrinfo_lists_t *lists = (addrinfo_lists_t*)user_data; hashipv6_t *ipv6_hash_table_entry = (hashipv6_t *)value; - if(!ipv6_hash_table_entry->is_dummy_entry){ - addrinfo_lists->ipv6_addr_list = g_list_prepend (addrinfo_lists->ipv6_addr_list, ipv6_hash_table_entry); - } + if(!ipv6_hash_table_entry->is_dummy_entry){ + lists->ipv6_addr_list = g_list_prepend (lists->ipv6_addr_list, ipv6_hash_table_entry); + } } addrinfo_lists_t * get_addrinfo_list(void) { - if(ipv4_hash_table){ - g_hash_table_foreach( ipv4_hash_table, ipv4_hash_table_resolved_to_list, &addrinfo_lists); - } + if(ipv4_hash_table){ + g_hash_table_foreach( ipv4_hash_table, ipv4_hash_table_resolved_to_list, &addrinfo_lists); + } - if(ipv4_hash_table){ - g_hash_table_foreach( ipv6_hash_table, ipv6_hash_table_resolved_to_list, &addrinfo_lists); - } + if(ipv4_hash_table){ + g_hash_table_foreach( ipv6_hash_table, ipv6_hash_table_resolved_to_list, &addrinfo_lists); + } return &addrinfo_lists; } |