projects
/
platform
/
upstream
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ed12a4d
)
gdhcp: Avoid shadowing address string variable
author
Marcel Holtmann
<marcel@holtmann.org>
Sun, 15 Jul 2012 22:29:26 +0000
(19:29 -0300)
committer
Marcel Holtmann
<marcel@holtmann.org>
Sun, 15 Jul 2012 22:29:26 +0000
(19:29 -0300)
gdhcp/client.c
patch
|
blob
|
history
diff --git
a/gdhcp/client.c
b/gdhcp/client.c
index
ec1b2a2
..
7e8e494
100644
(file)
--- a/
gdhcp/client.c
+++ b/
gdhcp/client.c
@@
-1665,7
+1665,7
@@
static GList *get_addresses(GDHCPClient *dhcp_client,
if (addr_count > 0 && st == 0) {
/* We only support one address atm */
if (addr_count > 0 && st == 0) {
/* We only support one address atm */
- char str[INET6_ADDRSTRLEN + 1];
+ char
addr_
str[INET6_ADDRSTRLEN + 1];
if (preferred > valid)
/* RFC 3315, 22.6 */
if (preferred > valid)
/* RFC 3315, 22.6 */
@@
-1674,11
+1674,11
@@
static GList *get_addresses(GDHCPClient *dhcp_client,
dhcp_client->T1 = T1;
dhcp_client->T2 = T2;
dhcp_client->T1 = T1;
dhcp_client->T2 = T2;
- inet_ntop(AF_INET6, &addr, str, INET6_ADDRSTRLEN);
+ inet_ntop(AF_INET6, &addr,
addr_
str, INET6_ADDRSTRLEN);
debug(dhcp_client, "count %d addr %s T1 %u T2 %u",
debug(dhcp_client, "count %d addr %s T1 %u T2 %u",
- addr_count, str, T1, T2);
+ addr_count,
addr_
str, T1, T2);
- list = g_list_append(list, g_strdup(str));
+ list = g_list_append(list, g_strdup(
addr_
str));
if (code == G_DHCPV6_IA_NA)
memcpy(&dhcp_client->ia_na, &addr,
if (code == G_DHCPV6_IA_NA)
memcpy(&dhcp_client->ia_na, &addr,