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

Tigthen scope of local variables 

svn path=/trunk/; revision=29770
This commit is contained in:
Kovarththanan Rajaratnam 2009-09-07 15:49:14 +00:00
parent 2fe83ebaed
commit ea0ab046e0
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/addr_resolv.c
View File

@ -977,24 +977,24 @@ static gchar *host_name_lookup6(struct e_in6_addr *addr, gboolean *found)
}
#endif
/* --------------------------- */
static const gchar *solve_address_to_name(address *addr)
{
guint32 ipv4_addr;
struct e_in6_addr ipv6_addr;
switch (addr->type) {
case AT_ETHER:
return get_ether_name(addr->data);
case AT_IPv4:
case AT_IPv4: {
guint32 ipv4_addr;
memcpy(&ipv4_addr, addr->data, sizeof ipv4_addr);
return get_hostname(ipv4_addr);
}
case AT_IPv6:
case AT_IPv6: {
struct e_in6_addr ipv6_addr;
memcpy(&ipv6_addr.bytes, addr->data, sizeof ipv6_addr.bytes);
return get_hostname6(&ipv6_addr);
}
case AT_STRINGZ:
return addr->data;
@ -1002,8 +1002,7 @@ static const gchar *solve_address_to_name(address *addr)
default:
return NULL;
}
} /* solve_address_to_name */
}
/*
* Ethernet / manufacturer resolution