diff options
| author | Thiebaud Weksteen <tweek@google.com> | 2017-10-26 02:58:15 -0700 |
|---|---|---|
| committer | Jaben Carsey <jaben.carsey@intel.com> | 2017-11-13 07:39:06 -0800 |
| commit | cb120565913676e4ae09b95ad66a4b321b4bee5d (patch) | |
| tree | 9aae374e69f41fa075bf351fed94ba13d8edab1a /StdLib | |
| parent | 207bc6a38c0ab108f814963642880946f6ade32b (diff) | |
| download | edk2-cb120565913676e4ae09b95ad66a4b321b4bee5d.tar.gz edk2-cb120565913676e4ae09b95ad66a4b321b4bee5d.tar.bz2 edk2-cb120565913676e4ae09b95ad66a4b321b4bee5d.zip | |
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>
Diffstat (limited to 'StdLib')
| -rw-r--r-- | StdLib/BsdSocketLib/getaddrinfo.c | 10 | ||||
| -rw-r--r-- | StdLib/BsdSocketLib/gethostbydns.c | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/StdLib/BsdSocketLib/getaddrinfo.c b/StdLib/BsdSocketLib/getaddrinfo.c index 5a0baf6d45..9d1acdb3fb 100644 --- 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>
#define endservent_r(svd) endservent()
-#define nsdispatch(pResult,dtab,database,routine,files,hostname,pai) NS_NOTFOUND
#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 )
#define res_nsend(state,buf,buflen,ans,anssiz) res_send ( buf, buflen, ans, anssiz )
@@ -306,6 +305,12 @@ do { \ #define MATCH(x, y, w) \
((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY)))
+int nsdispatch(void *result, const ns_dtab dist_tab[], const char* database,
+ const char *method, const ns_src defaults[], ...)
+{
+ return NS_NOTFOUND;
+}
+
const char *
gai_strerror(int ecode)
{
@@ -1062,9 +1067,6 @@ ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, u_int32_t *scopeid) /* code duplicate with gethnamaddr.c */
-static const char AskedForGot[] =
- "gethostby*.getanswer: asked for \"%s\", got \"%s\"";
-
static struct addrinfo *
getanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
const struct addrinfo *pai)
diff --git a/StdLib/BsdSocketLib/gethostbydns.c b/StdLib/BsdSocketLib/gethostbydns.c index 25e7c3b142..17c43ba59c 100644 --- 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
#define MAXADDRS 35
+#ifdef _ORG_FREEBSD_
static const char AskedForGot[] =
"gethostby*.gethostanswer: asked for \"%s\", got \"%s\"";
+#endif
static char *h_addr_ptrs[MAXADDRS + 1];
|