summaryrefslogtreecommitdiff
path: root/resolv/res_comp.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-02-07 00:06:12 +0000
committerUlrich Drepper <drepper@redhat.com>1999-02-07 00:06:12 +0000
commit8d8c6efa78d0eb67138bddf96415c2b80a4c820c (patch)
tree9ffb99e37931add0899606dc03b233a2e1e3f933 /resolv/res_comp.c
parentb8f558b7ace3a2e5e3234ac24a600cbe230da8d1 (diff)
Update.
1999-02-06 Ulrich Drepper <drepper@cygnus.com> * Versions.def: Add versions for ld.so. * csu/Versions: Remove __libc_stack_end here. * elf/Versions: Split libc definitions in libc and ld.so definitions. * elf/Makefile (ld-map): Change to ld.so.map. * scripts/versions.awk: Recognize dot in library names. * ctype/ctype.h: Remove definitions of __tolower and __toupper. Don't use __tolower and __toupper in inline functions. Add optimizing macros for tolower and toupper. * ctype/ctype-extn.c (_tolower): Don't use __tolower. (_toupper): Don't use __toupper. * ctype/ctype.c (tolower): Don't use __tolower. (toupper): Don't use toupper. * nscd/cache.c (prune_cache): Correct printing of debugging messages. * resolv/Versions (libresolv): Export __ns_name_unpack and __ns_name_ntop. * resolv/res_comp.c: Rename ns_name_unpack to __ns_name_unpack and make it global. Change all users. Similar for ns_name_ntop. * resolv/nss_dns/dns-host.c: Don't use dn_expand when extracting in user-provided buffer. Use __ns_name_unpack and __ns_name_ntop directly to detect too small buffer. * stdio-common/Makefile (tests): Add scanf12. * stdio-common/scanf12.c: New file. * stdio-common/scanf12.input: New file. * stdio-common/vfscanf.c (__vfscanf): Handle +/- at beginning of floating-point correctly if the number is invalid. * stdio-common/vfscanf.c: Don't use non-reentrant multibyte conversion * stdio-common/printf_fphex.c: Likewise. * stdio-common/vfprintf.c: Likewise. See ChangeLog.9 for earlier changes.
Diffstat (limited to 'resolv/res_comp.c')
-rw-r--r--resolv/res_comp.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/resolv/res_comp.c b/resolv/res_comp.c
index 2661963632..bc3b245351 100644
--- a/resolv/res_comp.c
+++ b/resolv/res_comp.c
@@ -75,10 +75,10 @@ static char rcsid[] = "$Id$";
# include "../conf/portability.h"
#endif
-static int ns_name_ntop __P((const u_char *, char *, size_t));
+extern int __ns_name_ntop __P((const u_char *, char *, size_t));
static int ns_name_pton __P((const char *, u_char *, size_t));
-static int ns_name_unpack __P((const u_char *, const u_char *,
- const u_char *, u_char *, size_t));
+extern int __ns_name_unpack __P((const u_char *, const u_char *,
+ const u_char *, u_char *, size_t));
static int ns_name_pack __P((const u_char *, u_char *, int,
const u_char **, const u_char **));
static int ns_name_uncompress __P((const u_char *, const u_char *,
@@ -349,7 +349,7 @@ __putlong(l, msgp)
/* Data. */
-static char digits[] = "0123456789";
+static const char digits[] = "0123456789";
/* Forward. */
@@ -370,8 +370,8 @@ static int dn_find(const u_char *, const u_char *,
* The root is returned as "."
* All other domains are returned in non absolute form
*/
-static int
-ns_name_ntop(src, dst, dstsiz)
+int
+__ns_name_ntop(src, dst, dstsiz)
const u_char *src;
char *dst;
size_t dstsiz;
@@ -388,7 +388,7 @@ ns_name_ntop(src, dst, dstsiz)
while ((n = *cp++) != 0) {
if ((n & NS_CMPRSFLGS) != 0) {
/* Some kind of compression pointer. */
- __set_errno (EMSGSIZE);
+ __set_errno (EINVAL);
return (-1);
}
if (dn != dst) {
@@ -565,8 +565,8 @@ ns_name_pton(src, dst, dstsiz)
* return:
* -1 if it fails, or consumed octets if it succeeds.
*/
-static int
-ns_name_unpack(msg, eom, src, dst, dstsiz)
+int
+__ns_name_unpack(msg, eom, src, dst, dstsiz)
const u_char *msg;
const u_char *eom;
const u_char *src;
@@ -767,9 +767,9 @@ ns_name_uncompress(msg, eom, src, dst, dstsiz)
u_char tmp[NS_MAXCDNAME];
int n;
- if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
+ if ((n = __ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
return (-1);
- if (ns_name_ntop(tmp, dst, dstsiz) == -1)
+ if (__ns_name_ntop(tmp, dst, dstsiz) == -1)
return (-1);
return (n);
}