aboutsummaryrefslogtreecommitdiff
path: root/resolv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-10-03 00:14:09 +0000
committerUlrich Drepper <drepper@redhat.com>1999-10-03 00:14:09 +0000
commitfcb594165e6433e6533dc4bda5eb319bcb59d465 (patch)
treeb25b50d559d0d4414e3c25e8bea69dd2af5c2318 /resolv
parent0c03cb9bedf3454129ac8e50ab2d3db9b7260c78 (diff)
downloadglibc-fcb594165e6433e6533dc4bda5eb319bcb59d465.zip
glibc-fcb594165e6433e6533dc4bda5eb319bcb59d465.tar.gz
glibc-fcb594165e6433e6533dc4bda5eb319bcb59d465.tar.bz2
Update.
* resolv/nsap_addr.c (inet_nsap_addr): Little optimization. * resolv/inet_ntop.c (inet_ntop4): Little optimization. (inet_ntop6): Likewise.
Diffstat (limited to 'resolv')
-rw-r--r--resolv/inet_ntop.c10
-rw-r--r--resolv/nsap_addr.c3
2 files changed, 5 insertions, 8 deletions
diff --git a/resolv/inet_ntop.c b/resolv/inet_ntop.c
index 644abee..2f076d4 100644
--- a/resolv/inet_ntop.c
+++ b/resolv/inet_ntop.c
@@ -97,8 +97,7 @@ inet_ntop4(src, dst, size)
__set_errno (ENOSPC);
return (NULL);
}
- strcpy(dst, tmp);
- return (dst);
+ return strcpy(dst, tmp);
}
/* const char *
@@ -132,8 +131,8 @@ inet_ntop6(src, dst, size)
* Find the longest run of 0x00's in src[] for :: shorthanding.
*/
memset(words, '\0', sizeof words);
- for (i = 0; i < IN6ADDRSZ; i++)
- words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
+ for (i = 0; i < IN6ADDRSZ; i += 2)
+ words[i / 2] = (src[i] << 8) | src[i + 1];
best.base = -1;
cur.base = -1;
for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) {
@@ -194,6 +193,5 @@ inet_ntop6(src, dst, size)
__set_errno (ENOSPC);
return (NULL);
}
- strcpy(dst, tmp);
- return (dst);
+ return strcpy(dst, tmp);
}
diff --git a/resolv/nsap_addr.c b/resolv/nsap_addr.c
index 2222cda..53a19d5 100644
--- a/resolv/nsap_addr.c
+++ b/resolv/nsap_addr.c
@@ -60,8 +60,7 @@ inet_nsap_addr(ascii, binary, maxlen)
continue;
if (!isascii(c))
return (0);
- if (islower(c))
- c = toupper(c);
+ c = toupper(c);
if (isxdigit(c)) {
nib = xtob(c);
if ((c = *ascii++)) {