Mercurial > hg > dhcpcd
changeset 2598:928c1d90f3e0 draft
Fix gcc build errors.
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Mon, 14 Jul 2014 12:55:19 +0000 |
| parents | 4972356b11e8 |
| children | 6416d483225f |
| files | dhcp6.c |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/dhcp6.c Mon Jul 14 11:30:15 2014 +0000 +++ b/dhcp6.c Mon Jul 14 12:55:19 2014 +0000 @@ -1628,7 +1628,7 @@ continue; } p = D6_COPTION_DATA(o); - iap = (struct dhcp6_ia_addr *)D6_COPTION_DATA(o); + iap = (const struct dhcp6_ia_addr *)D6_COPTION_DATA(o); p += sizeof(in6); a = dhcp6_findaddr(ifp, &iap->addr); if (a == NULL) { @@ -1690,7 +1690,7 @@ char iabuf[INET6_ADDRSTRLEN]; const char *ia; int i; - uint8_t u8, len, *pw; + uint8_t u8, *pw; size_t off; uint16_t ol; const struct dhcp6_pd_addr *pdp; @@ -1751,7 +1751,7 @@ state->expire = a->prefix_vltime; i++; - p = D6_OPTION_DATA(o) + sizeof(pdp); + p = D6_COPTION_DATA(o) + sizeof(pdp); ol -= sizeof(pdp); ex = dhcp6_findoption(D6_OPTION_PD_EXCLUDE, p, ol); a->prefix_exclude_len = 0; @@ -1788,7 +1788,6 @@ a->prefix_exclude_len = 0; continue; } - len = a->prefix_len / NBBY; u8 = a->prefix_len % NBBY; memcpy(&a->prefix_exclude, &a->prefix, sizeof(a->prefix_exclude));