qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolve: Proper indent resolv/inet_ntop.c 

Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
Adhemerval Zanella 2025-06-04 17:42:42 -03:00
parent 14ca258cc5
commit f22f6a5b84
1 changed files with 110 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
resolv/inet_ntop.c
View File

@ -28,9 +28,9 @@
#include <string.h> #include <string.h>
#ifdef SPRINTF_CHAR #ifdef SPRINTF_CHAR
# define SPRINTF(x) strlen(sprintf/**/x) # define SPRINTF(x) strlen (sprintf /**/ x)
#else #else
# define SPRINTF(x) ((size_t)sprintf x) # define SPRINTF(x) ((size_t) sprintf x)
#endif #endif
/* /*
@ -52,11 +52,12 @@ static const char *inet_ntop6 (const u_char *src, char *dst, socklen_t size);
const char * const char *
__inet_ntop (int af, const void *src, char *dst, socklen_t size) __inet_ntop (int af, const void *src, char *dst, socklen_t size)
{ {
switch (af) { switch (af)
{
case AF_INET: case AF_INET:
return (inet_ntop4(src, dst, size)); return (inet_ntop4 (src, dst, size));
case AF_INET6: case AF_INET6:
return (inet_ntop6(src, dst, size)); return (inet_ntop6 (src, dst, size));
default: default:
__set_errno (EAFNOSUPPORT); __set_errno (EAFNOSUPPORT);
return (NULL); return (NULL);
@ -83,11 +84,12 @@ inet_ntop4 (const u_char *src, char *dst, socklen_t size)
static const char fmt[] = "%u.%u.%u.%u"; static const char fmt[] = "%u.%u.%u.%u";
char tmp[sizeof "255.255.255.255"]; char tmp[sizeof "255.255.255.255"];
if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) >= size) { if (SPRINTF ((tmp, fmt, src[0], src[1], src[2], src[3])) >= size)
{
__set_errno (ENOSPC); __set_errno (ENOSPC);
return (NULL); return (NULL);
} }
return strcpy(dst, tmp); return strcpy (dst, tmp);
} }
/* const char * /* const char *
@ -107,7 +109,10 @@ inet_ntop6 (const u_char *src, char *dst, socklen_t size)
* to use pointer overlays. All the world's not a VAX. * to use pointer overlays. All the world's not a VAX.
*/ */
char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
struct { int base, len; } best, cur; struct
{
int base, len;
} best, cur;
u_int words[NS_IN6ADDRSZ / NS_INT16SZ]; u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
int i; int i;
@ -116,28 +121,34 @@ inet_ntop6 (const u_char *src, char *dst, socklen_t size)
* Copy the input (bytewise) array into a wordwise array. * Copy the input (bytewise) array into a wordwise array.
* Find the longest run of 0x00's in src[] for :: shorthanding. * Find the longest run of 0x00's in src[] for :: shorthanding.
*/ */
memset(words, '\0', sizeof words); memset (words, '\0', sizeof words);
for (i = 0; i < NS_IN6ADDRSZ; i += 2) for (i = 0; i < NS_IN6ADDRSZ; i += 2)
words[i / 2] = (src[i] << 8) | src[i + 1]; words[i / 2] = (src[i] << 8) | src[i + 1];
best.base = -1; best.base = -1;
cur.base = -1; cur.base = -1;
best.len = 0; best.len = 0;
cur.len = 0; cur.len = 0;
for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++)
if (words[i] == 0) { {
if (words[i] == 0)
{
if (cur.base == -1) if (cur.base == -1)
cur.base = i, cur.len = 1; cur.base = i, cur.len = 1;
else else
cur.len++; cur.len++;
} else { }
if (cur.base != -1) { else
{
if (cur.base != -1)
{
if (best.base == -1 || cur.len > best.len) if (best.base == -1 || cur.len > best.len)
best = cur; best = cur;
cur.base = -1; cur.base = -1;
} }
} }
} }
if (cur.base != -1) { if (cur.base != -1)
{
if (best.base == -1 || cur.len > best.len) if (best.base == -1 || cur.len > best.len)
best = cur; best = cur;
} }
@ -148,10 +159,11 @@ inet_ntop6 (const u_char *src, char *dst, socklen_t size)
* Format the result. * Format the result.
*/ */
tp = tmp; tp = tmp;
for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++)
{
/* Are we inside the best run of 0x00's? */ /* Are we inside the best run of 0x00's? */
if (best.base != -1 && i >= best.base && if (best.base != -1 && i >= best.base && i < (best.base + best.len))
i < (best.base + best.len)) { {
if (i == best.base) if (i == best.base)
*tp++ = ':'; *tp++ = ':';
continue; continue;
@ -160,27 +172,28 @@ inet_ntop6 (const u_char *src, char *dst, socklen_t size)
if (i != 0) if (i != 0)
*tp++ = ':'; *tp++ = ':';
/* Is this address an encapsulated IPv4? */ /* Is this address an encapsulated IPv4? */
if (i == 6 && best.base == 0 && if (i == 6 && best.base == 0
(best.len == 6 || (best.len == 5 && words[5] == 0xffff))) { && (best.len == 6 || (best.len == 5 && words[5] == 0xffff)))
if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp))) {
if (!inet_ntop4 (src + 12, tp, sizeof tmp - (tp - tmp)))
return (NULL); return (NULL);
tp += strlen(tp); tp += strlen (tp);
break; break;
} }
tp += SPRINTF((tp, "%x", words[i])); tp += SPRINTF ((tp, "%x", words[i]));
} }
/* Was it a trailing run of 0x00's? */ /* Was it a trailing run of 0x00's? */
if (best.base != -1 && (best.base + best.len) == if (best.base != -1 && (best.base + best.len) == (NS_IN6ADDRSZ / NS_INT16SZ))
(NS_IN6ADDRSZ / NS_INT16SZ))
*tp++ = ':'; *tp++ = ':';
*tp++ = '\0'; *tp++ = '\0';
/* /*
* Check for overflow, copy, and we're done. * Check for overflow, copy, and we're done.
*/ */
if ((socklen_t)(tp - tmp) > size) { if ((socklen_t) (tp - tmp) > size)
{
__set_errno (ENOSPC); __set_errno (ENOSPC);
return (NULL); return (NULL);
} }
return strcpy(dst, tmp); return strcpy (dst, tmp);
} }