StdLib/BsdSocketLib: Remove unused variables

TianoCore BZ#677

Remove unused variables and turn nsdispatch macro into a function. This
is not what is recommended in the bug ticket but avoid heavier
modification of the code (and deviation from upsteam).

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Thiebaud Weksteen <tweek@google.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

diff --git a/StdLib/BsdSocketLib/getaddrinfo.c b/StdLib/BsdSocketLib/getaddrinfo.c
index 5a0baf6d45f55226afce539b86f29af3e03ab9af..9d1acdb3fb357b0480687380cf2beb5851d74e3c 100644 (file)
--- a/StdLib/BsdSocketLib/getaddrinfo.c
+++ b/StdLib/BsdSocketLib/getaddrinfo.c
@@ -92,7 +92,6 @@ __RCSID("$NetBSD: getaddrinfo.c,v 1.91.6.1 2009/01/26 00:27:34 snj Exp $");
 #include <net/servent.h>\r
 \r
 #define endservent_r(svd)   endservent()\r
 #include <net/servent.h>\r
 \r
 #define endservent_r(svd)   endservent()\r

-#define nsdispatch(pResult,dtab,database,routine,files,hostname,pai)  NS_NOTFOUND\r

 #define res_nmkquery(state,op,dname,class,type,data,datalen,newrr_in,buf,buflen)  res_mkquery( op, dname, class, type, data, datalen, newrr_in, buf, buflen )\r
 #define res_nsend(state,buf,buflen,ans,anssiz)    res_send ( buf, buflen, ans, anssiz )\r
 \r
 #define res_nmkquery(state,op,dname,class,type,data,datalen,newrr_in,buf,buflen)  res_mkquery( op, dname, class, type, data, datalen, newrr_in, buf, buflen )\r
 #define res_nsend(state,buf,buflen,ans,anssiz)    res_send ( buf, buflen, ans, anssiz )\r
 \r


@@ -306,6 +305,12 @@ do {                                                               \
 #define MATCH(x, y, w)                                                         \\r
        ((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY)))\r
 \r
 #define MATCH(x, y, w)                                                         \\r
        ((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY)))\r
 \r

+int nsdispatch(void *result, const ns_dtab dist_tab[], const char* database,\r
+               const char *method, const ns_src defaults[], ...)\r
+{\r
+  return NS_NOTFOUND;\r
+}\r
+\r

 const char *\r
 gai_strerror(int ecode)\r
 {\r
 const char *\r
 gai_strerror(int ecode)\r
 {\r


@@ -1062,9 +1067,6 @@ ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, u_int32_t *scopeid)
 \r
 /* code duplicate with gethnamaddr.c */\r
 \r
 \r
 /* code duplicate with gethnamaddr.c */\r
 \r

-static const char AskedForGot[] =\r
-       "gethostby*.getanswer: asked for \"%s\", got \"%s\"";\r
-\r

 static struct addrinfo *\r
 getanswer(const querybuf *answer, int anslen, const char *qname, int qtype,\r
     const struct addrinfo *pai)\r
 static struct addrinfo *\r
 getanswer(const querybuf *answer, int anslen, const char *qname, int qtype,\r
     const struct addrinfo *pai)\r

diff --git a/StdLib/BsdSocketLib/gethostbydns.c b/StdLib/BsdSocketLib/gethostbydns.c
index 25e7c3b142a0b620dded288ad8fa81193ad9824b..17c43ba59c1f71580c9073a5231af0c0b8a3d0d0 100644 (file)
--- a/StdLib/BsdSocketLib/gethostbydns.c
+++ b/StdLib/BsdSocketLib/gethostbydns.c
@@ -129,8 +129,10 @@ u_int16_t _getshort(const u_char *src);
 #define        MAXALIASES      35\r
 #define        MAXADDRS        35\r
 \r
 #define        MAXALIASES      35\r
 #define        MAXADDRS        35\r
 \r

+#ifdef _ORG_FREEBSD_\r

 static const char AskedForGot[] =\r
                "gethostby*.gethostanswer: asked for \"%s\", got \"%s\"";\r
 static const char AskedForGot[] =\r
                "gethostby*.gethostanswer: asked for \"%s\", got \"%s\"";\r

+#endif\r

 \r
 static char *h_addr_ptrs[MAXADDRS + 1];\r
 \r
 \r
 static char *h_addr_ptrs[MAXADDRS + 1];\r
 \r