abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-08-09 17:13:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make functions static where applicable, add default cases to switches where applicable, prevent old-style function prototypes (without arguments)

Browse Source
This commit is contained in:
goldsimon
2010-03-26 14:07:05 +00:00
parent 8bbe3d2fe0
commit 46b7bd6ec3
5 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/ipv4/ip_addr.c
View File

@@ -163,8 +163,9 @@ ipaddr_aton(const char *cp, ip_addr_t *addr)
* a.b.c (with c treated as 16 bits)
* a.b (with b treated as 24 bits)
*/
if (pp >= parts + 3)
if (pp >= parts + 3) {
return (0);
}
*pp++ = val;
c = *++cp;
} else
@@ -173,8 +174,9 @@ ipaddr_aton(const char *cp, ip_addr_t *addr)
/*
* Check for trailing characters.
*/
if (c != '\0' && !isspace(c))
if (c != '\0' && !isspace(c)) {
return (0);
}
/*
* Concoct the address according to
* the number of parts specified.
@@ -188,22 +190,28 @@ ipaddr_aton(const char *cp, ip_addr_t *addr)
break;
case 2: /* a.b -- 8.24 bits */
if (val > 0xffffffUL)
if (val > 0xffffffUL) {
return (0);
}
val |= parts[0] << 24;
break;
case 3: /* a.b.c -- 8.8.16 bits */
if (val > 0xffff)
if (val > 0xffff) {
return (0);
}
val |= (parts[0] << 24) | (parts[1] << 16);
break;
case 4: /* a.b.c.d -- 8.8.8.8 bits */
if (val > 0xff)
if (val > 0xff) {
return (0);
}
val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
break;
default:
LWIP_ASSERT("unhandled", 0);
break;
}
if (addr) {
ip4_addr_set_u32(addr, htonl(val));