resolv: Move ns_name_uncompress into its own file and into libc

And reformat to GNU style.  Check for negative error returns
(instead of -1).

The symbol was moved using scripts/move-symbol-to-libc.py.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>

4 files changed, 49 insertions, 25 deletions

diff --git a/resolv/Makefile b/resolv/Makefile
index 91ce46a3b9..3145ddebb7 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -34,6 +34,7 @@ routines := \
   inet_pton \
   ns_name_ntop \
   ns_name_skip \
+  ns_name_uncompress \
   ns_name_unpack \
   nsap_addr \
   res-close \
diff --git a/resolv/Versions b/resolv/Versions
index b075881b24..9e8762f984 100644
--- a/resolv/Versions
+++ b/resolv/Versions
@@ -27,6 +27,7 @@ libc {
   GLIBC_2.9 {
     ns_name_ntop;
     ns_name_skip;
+    ns_name_uncompress;
     ns_name_unpack;
   }
   GLIBC_2.34 {
@@ -38,6 +39,7 @@ libc {
 %endif
     ns_name_ntop;
     ns_name_skip;
+    ns_name_uncompress;
     ns_name_unpack;
   }
   GLIBC_PRIVATE {
@@ -49,6 +51,7 @@ libc {
     __inet_pton_length;
     __ns_name_ntop;
     __ns_name_skip;
+    __ns_name_uncompress;
     __ns_name_unpack;
     __res_iclose;
     __resolv_context_get;
@@ -152,7 +155,6 @@ libresolv {
     ns_name_pton;
     ns_name_rollback;
     ns_name_skip;
-    ns_name_uncompress;
     ns_parse_ttl;
     ns_parserr;
     ns_put16;
diff --git a/resolv/ns_name.c b/resolv/ns_name.c
index 58d6a60ce4..35e25cbd83 100644
--- a/resolv/ns_name.c
+++ b/resolv/ns_name.c
@@ -330,30 +330,6 @@ cleanup:
 libresolv_hidden_def (ns_name_pack)
 
 /*%
- *	Expand compressed domain name to presentation format.
- *
- * return:
- *\li	Number of bytes read out of `src', or -1 (with errno set).
- *
- * note:
- *\li	Root domain returns as "." not "".
- */
-int
-ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src,
-		   char *dst, size_t dstsiz)
-{
-	u_char tmp[NS_MAXCDNAME];
-	int n;
-
-	if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
-		return (-1);
-	if (__ns_name_ntop (tmp, dst, dstsiz) == -1)
-		return (-1);
-	return (n);
-}
-libresolv_hidden_def (ns_name_uncompress)
-
-/*%
  *	Compress a domain name into wire format, using compression pointers.
  *
  * return:
diff --git a/resolv/ns_name_uncompress.c b/resolv/ns_name_uncompress.c
new file mode 100644
index 0000000000..95ecbe315b
--- /dev/null
+++ b/resolv/ns_name_uncompress.c
@@ -0,0 +1,45 @@
+/* Expand compressed domain name to presentation format.
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 1996,1999 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <arpa/nameser.h>
+#include <shlib-compat.h>
+
+/* Expand compressed domain name to presentation format.  Returns the
+   number of bytes read out of `src', or -1 (with errno set).  The
+   root domain is returned as ".", not "".  */
+int
+___ns_name_uncompress (const unsigned char *msg, const unsigned char *eom,
+                       const unsigned char *src, char *dst, size_t dstsiz)
+{
+  unsigned char tmp[NS_MAXCDNAME];
+  int n = __ns_name_unpack (msg, eom, src, tmp, sizeof tmp);
+  if (n < 0)
+    return -1;
+  if (__ns_name_ntop (tmp, dst, dstsiz) < 0)
+    return -1;
+  return n;
+}
+versioned_symbol (libc, ___ns_name_uncompress, ns_name_uncompress,
+                  GLIBC_2_34);
+versioned_symbol (libc, ___ns_name_uncompress, __ns_name_uncompress,
+                  GLIBC_PRIVATE);
+libc_hidden_ver (___ns_name_uncompress, __ns_name_uncompress)
+
+#if OTHER_SHLIB_COMPAT (libresolv, GLIBC_2_9, GLIBC_2_34)
+compat_symbol (libresolv, ___ns_name_uncompress, ns_name_uncompress,
+               GLIBC_2_9);
+#endif