make __{en,de}code_dotted into macros

they merely call dn_{comp,expand} slightly rearranging the arguments

Signed-off-by: mirabilos <mirabilos@evolvis.org>

4 files changed, 7 insertions, 52 deletions

diff --git a/libc/inet/Makefile.in b/libc/inet/Makefile.in
index 91c417cc2..5e43f2303 100644
--- a/libc/inet/Makefile.in
+++ b/libc/inet/Makefile.in
@@ -26,7 +26,7 @@ CSRC-$(V4_OR_V6) += \
 	inet_lnaof.c inet_netof.c
 # multi source resolv.c
 CSRC-$(V4_OR_V6) += \
-	encodeh.c decodeh.c encoded.c decoded.c \
+	encodeh.c decodeh.c \
 	encodeq.c encodea.c \
 	read_etc_hosts_r.c \
 	dnslookup.c opennameservers.c closenameservers.c \
diff --git a/libc/inet/decoded.c b/libc/inet/decoded.c
deleted file mode 100644
index 378cbfad7..000000000
--- a/libc/inet/decoded.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
- *
- * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- */
-
-#define L_decoded
-#include RESOLVER
diff --git a/libc/inet/encoded.c b/libc/inet/encoded.c
deleted file mode 100644
index 27f92becd..000000000
--- a/libc/inet/encoded.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
- *
- * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- */
-
-#define L_encoded
-#include RESOLVER
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index f02781b0b..ced3b6542 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -396,14 +396,6 @@ extern int __dns_lookup(const char *name,
 		int type,
 		unsigned char **outpacket,
 		struct resolv_answer *a) attribute_hidden;
-extern int __encode_dotted(const char *dotted,
-		unsigned char *dest,
-		int maxlen) attribute_hidden;
-extern int __decode_dotted(const unsigned char *packet,
-		int offset,
-		int packet_len,
-		char *dest,
-		int dest_len) attribute_hidden;
 extern int __encode_header(struct resolv_header *h,
 		unsigned char *dest,
 		int maxlen) attribute_hidden;
@@ -418,6 +410,12 @@ extern int __encode_answer(struct resolv_answer *a,
 extern void __open_nameservers(void) attribute_hidden;
 extern void __close_nameservers(void) attribute_hidden;
 
+#define __encode_dotted(dotted,dest,maxlen) \
+	dn_comp((dotted), (dest), (maxlen), NULL, NULL)
+#define __decode_dotted(packet,offset,packet_len,dest,dest_len) \
+	dn_expand((packet), (packet) + (packet_len), (packet) + (offset), \
+	    (dest), (dest_len))
+
 /*
  * Theory of operation.
  *
@@ -553,33 +551,6 @@ void __decode_header(unsigned char *data,
 #endif /* L_decodeh */
 
 
-#ifdef L_encoded
-
-/* Encode a dotted string into nameserver transport-level encoding.
-   This routine is fairly dumb, and doesn't attempt to compress
-   the data */
-int __encode_dotted(const char *dotted, unsigned char *dest, int maxlen)
-{
-	return (dn_comp(dotted, dest, maxlen, NULL, NULL));
-}
-#endif /* L_encoded */
-
-
-#ifdef L_decoded
-
-/* Decode a dotted string from nameserver transport-level encoding.
-   This routine understands compressed data. */
-int __decode_dotted(const unsigned char *packet,
-		int offset,
-		int packet_len,
-		char *dest,
-		int dest_len)
-{
-	return (dn_expand(packet, packet + packet_len, packet + offset, dest, dest_len));
-}
-#endif /* L_decoded */
-
-
 #ifdef L_encodeq
 
 int __encode_question(const struct resolv_question *q,