X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b751376719cfe1924aa07ab8fd364ec1a55c04b3..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/addrtostr.c diff --git a/addrtostr.c b/addrtostr.c index 62cc298a..5a08929a 100644 --- a/addrtostr.c +++ b/addrtostr.c @@ -71,7 +71,7 @@ addrtostr (const void *src, char *dst, size_t size) return NULL; } for (i = 0; i < 4; ++i) { - int n = *srcaddr++; + int n = *srcaddr++; int non_zerop = 0; if (non_zerop || n / 100 > 0) { @@ -127,16 +127,12 @@ addrtostr6 (const void *src, char *dst, size_t size) best.base = -1; cur.len = 0; cur.base = -1; - for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) - { - if (words[i] == 0) - { + for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { + if (words[i] == 0) { if (cur.base == -1) cur.base = i, cur.len = 1; else cur.len++; - } - else if (cur.base != -1) - { + } else if (cur.base != -1) { if (best.base == -1 || cur.len > best.len) best = cur; cur.base = -1; @@ -160,14 +156,12 @@ addrtostr6 (const void *src, char *dst, size_t size) *dp++ = c; \ space_left--; \ } - for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) - { + for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { /* Are we inside the best run of 0x00's? */ - if (best.base != -1 && i >= best.base && i < (best.base + best.len)) - { + if (best.base != -1 && i >= best.base && i < (best.base + best.len)) { if (i == best.base) - APPEND_CHAR(':'); + APPEND_CHAR(':'); continue; } @@ -181,8 +175,7 @@ addrtostr6 (const void *src, char *dst, size_t size) if (i == 6 && best.base == 0 && (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) { - if (!addrtostr(srcaddr+12, dp, space_left)) - { + if (!addrtostr(srcaddr+12, dp, space_left)) { errno = ENOSPC; return (NULL); } @@ -194,8 +187,7 @@ addrtostr6 (const void *src, char *dst, size_t size) snprintfed = snprintf (dp, space_left, "%x", words[i]); if (snprintfed < 0) return (NULL); - if ((size_t) snprintfed >= space_left) - { + if ((size_t) snprintfed >= space_left) { errno = ENOSPC; return (NULL); }