StdLib/Environs: Avoid infinite recursion in _Exit

[mirror_edk2.git] / StdLib / BsdSocketLib / getaddrinfo.c

diff --git a/StdLib/BsdSocketLib/getaddrinfo.c b/StdLib/BsdSocketLib/getaddrinfo.c
index 11489421d8a5e7d4edcaaeb09d76521b637ad9e9..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
-#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
@@ -306,6 +305,12 @@ do {                                                               \
 #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
@@ -556,6 +561,13 @@ getaddrinfo(const char *hostname, const char *servname,
        return error;\r
 }\r
 \r
+static const ns_dtab dtab[] = {\r
+  NS_FILES_CB(((nss_method)_files_getaddrinfo), NULL)\r
+  { NSSRC_DNS, ((nss_method)_dns_getaddrinfo), NULL },  /* force -DHESIOD */\r
+  NS_NIS_CB(_yp_getaddrinfo, NULL)\r
+  NS_NULL_CB\r
+};\r
+\r
 /*\r
  * FQDN hostname, DNS lookup\r
  */\r
@@ -566,12 +578,6 @@ explore_fqdn(const struct addrinfo *pai, const char *hostname,
        struct addrinfo *result;\r
        struct addrinfo *cur;\r
        int error = 0;\r
-       static const ns_dtab dtab[] = {\r
-               NS_FILES_CB(_files_getaddrinfo, NULL)\r
-               { NSSRC_DNS, _dns_getaddrinfo, NULL },  /* force -DHESIOD */\r
-               NS_NIS_CB(_yp_getaddrinfo, NULL)\r
-               NS_NULL_CB\r
-       };\r
 \r
        _DIAGASSERT(pai != NULL);\r
        /* hostname may be NULL */\r
@@ -1061,9 +1067,6 @@ ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, u_int32_t *scopeid)
 \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