Fix some errors detected by the GCC 4.4 compiler.

Signed-off-by: lpleahy
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13006 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/StdLib/BsdSocketLib/getaddrinfo.c b/StdLib/BsdSocketLib/getaddrinfo.c
index 11489421d8a5e7d4edcaaeb09d76521b637ad9e9..c8ed7848a427a11b4b29974dcb93b6bc9dae6fdc 100644 (file)
--- a/StdLib/BsdSocketLib/getaddrinfo.c
+++ b/StdLib/BsdSocketLib/getaddrinfo.c
@@ -556,6 +556,13 @@ getaddrinfo(const char *hostname, const char *servname,
        return error;\r
 }\r
 \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
 /*\r
  * FQDN hostname, DNS lookup\r
  */\r
@@ -566,12 +573,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

diff --git a/StdLib/BsdSocketLib/herror.c b/StdLib/BsdSocketLib/herror.c
index c918f3acef3f9a631c459fc27d45d940404650f8..d8a51632641d890f718e9e270d38c3dfc04fa748 100644 (file)
--- a/StdLib/BsdSocketLib/herror.c
+++ b/StdLib/BsdSocketLib/herror.c
@@ -95,7 +95,6 @@ herror(
 {\r
   struct iovec iov[4];\r
   register struct iovec *v = iov;\r
-  int   i;\r
 \r
   if (s && *s) {\r
     v->iov_base = (char *)s;\r
@@ -110,11 +109,14 @@ herror(
   v++;\r
   v->iov_base = "\n";\r
   v->iov_len = 1;\r
-#ifdef _ORG_FREEBSD_\r
+#if defined(_ORG_FREEBSD_) || defined(__GNUC__)\r
   writev(STDERR_FILENO, iov, (v - iov) + 1);\r
 #else\r
-  for (i = 0; i < (v - iov) + 1; i++)\r
-    fprintf( stderr, iov[i].iov_base);\r
+  {\r
+    int   i;\r
+    for (i = 0; i < (v - iov) + 1; i++)\r
+      fprintf( stderr, iov[i].iov_base);\r
+  }\r
 #endif\r
 \r
 }\r

diff --git a/StdLib/BsdSocketLib/ns_name.c b/StdLib/BsdSocketLib/ns_name.c
index 9303b3f437a0b3e57c52cefd59c01c74e00cb039..3b8706acba3aa4445818a745b79b70f617642342 100644 (file)
--- a/StdLib/BsdSocketLib/ns_name.c
+++ b/StdLib/BsdSocketLib/ns_name.c
@@ -55,10 +55,6 @@
  * \r
  */\r
 \r
-#ifndef lint\r
-static char rcsid[] = "$Id: ns_name.c,v 1.1.1.1 2003/11/19 01:51:32 kyu3 Exp $";\r
-#endif\r
-\r
 #include <sys/types.h>\r
 \r
 #include <netinet/in.h>\r

diff --git a/StdLib/BsdSocketLib/ns_netint.c b/StdLib/BsdSocketLib/ns_netint.c
index 6a3b290ead9ddd7989cc1505da587767679b28ed..977fb301476fd482037749d738ec8dc60eb27194 100644 (file)
--- a/StdLib/BsdSocketLib/ns_netint.c
+++ b/StdLib/BsdSocketLib/ns_netint.c
@@ -15,10 +15,6 @@
  * SOFTWARE.\r
  */\r
 \r
-#ifndef lint\r
-static char rcsid[] = "$Id: ns_netint.c,v 1.1.1.1 2003/11/19 01:51:33 kyu3 Exp $";\r
-#endif\r
-\r
 /* Import. */\r
 \r
 #include <sys/types.h>\r

diff --git a/StdLib/BsdSocketLib/ns_parse.c b/StdLib/BsdSocketLib/ns_parse.c
index b050cdee1f95aa611f6dc2f436ee648066e7712e..6909d4ef5c3696bc8e4bd99cd8a7993b0f3aac40 100644 (file)
--- a/StdLib/BsdSocketLib/ns_parse.c
+++ b/StdLib/BsdSocketLib/ns_parse.c
@@ -55,10 +55,6 @@
  * \r
  */\r
 \r
-#ifndef lint\r
-static char rcsid[] = "$Id: ns_parse.c,v 1.1.1.1 2003/11/19 01:51:33 kyu3 Exp $";\r
-#endif\r
-\r
 #include <sys/types.h>\r
 \r
 #include <netinet/in.h>\r

diff --git a/StdLib/BsdSocketLib/ns_print.c b/StdLib/BsdSocketLib/ns_print.c
index 83aeeb32a03e2c19fb3f731510567490bd79911c..ff7047a1fd409b148eabe25561ed3fd72b64aad0 100644 (file)
--- a/StdLib/BsdSocketLib/ns_print.c
+++ b/StdLib/BsdSocketLib/ns_print.c
@@ -55,10 +55,6 @@
  * \r
  */\r
 \r
-#ifndef lint\r
-static char rcsid[] = "$Id: ns_print.c,v 1.1.1.1 2003/11/19 01:51:34 kyu3 Exp $";\r
-#endif\r
-\r
 /* Import. */\r
 \r
 #include <sys/types.h>\r

diff --git a/StdLib/BsdSocketLib/ns_ttl.c b/StdLib/BsdSocketLib/ns_ttl.c
index a5a57449ebb845f9d876db5e56fe39b091a9a1d3..aba847994bd5149066e9df0382a7c1618dde69a8 100644 (file)
--- a/StdLib/BsdSocketLib/ns_ttl.c
+++ b/StdLib/BsdSocketLib/ns_ttl.c
@@ -55,10 +55,6 @@
  * \r
  */\r
 \r
-#ifndef lint\r
-static char rcsid[] = "$Id: ns_ttl.c,v 1.1.1.1 2003/11/19 01:51:34 kyu3 Exp $";\r
-#endif\r
-\r
 /* Import. */\r
 \r
 #include <arpa/nameser.h>\r

diff --git a/StdLib/BsdSocketLib/nsap_addr.c b/StdLib/BsdSocketLib/nsap_addr.c
index 957c97f55ff451e07ca02ad916a87460df7b5bcf..6c904b7c9e5f2bd2ba4a88744ab93ec6a56b2a60 100644 (file)
--- a/StdLib/BsdSocketLib/nsap_addr.c
+++ b/StdLib/BsdSocketLib/nsap_addr.c
@@ -15,10 +15,6 @@
  * SOFTWARE.\r
  */\r
 \r
-#if defined(LIBC_SCCS) && !defined(lint)\r
-static char rcsid[] = "$Id: nsap_addr.c,v 1.1.1.1 2003/11/19 01:51:31 kyu3 Exp $";\r
-#endif /* LIBC_SCCS and not lint */\r
-\r
 #include <sys/types.h>\r
 #include <sys/param.h>\r
 #include <sys/socket.h>\r

diff --git a/StdLib/BsdSocketLib/res_mkupdate.c b/StdLib/BsdSocketLib/res_mkupdate.c
index b27c2e460b886a20241fcc957c8d46b1cb655e9b..3201f312e6834c3ad73b0c78c801f2e96c2502e8 100644 (file)
--- a/StdLib/BsdSocketLib/res_mkupdate.c
+++ b/StdLib/BsdSocketLib/res_mkupdate.c
@@ -60,10 +60,6 @@
  * <viraj_bais@ccm.fm.intel.com>\r
  */\r
 \r
-#if !defined(lint) && !defined(SABER)\r
-static char rcsid[] = "$Id: res_mkupdate.c,v 1.1.1.1 2003/11/19 01:51:38 kyu3 Exp $";\r
-#endif /* not lint */\r
-\r
 #include <sys/types.h>\r
 #include <sys/param.h>\r
 \r

diff --git a/StdLib/BsdSocketLib/res_update.c b/StdLib/BsdSocketLib/res_update.c
index 1ad8a8719eabeb5db9e5c6418b14398b7a3db2b5..a01d83203c2b77520bd2f78257497c9fe5731fb0 100644 (file)
--- a/StdLib/BsdSocketLib/res_update.c
+++ b/StdLib/BsdSocketLib/res_update.c
@@ -1,7 +1,3 @@
-#if !defined(lint) && !defined(SABER)\r
-static char rcsid[] = "$Id: res_update.c,v 1.1.1.1 2003/11/19 01:51:39 kyu3 Exp $";\r
-#endif /* not lint */\r
-\r
 /*\r
  * Copyright (c) 1996 by Internet Software Consortium.\r
  *\r