fix low-hanging gcc warnings, mostly for Windows

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1083183 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 59 insertions, 55 deletions

diff --git a/file_io/win32/filestat.c b/file_io/win32/filestat.c
index d2997b2ee..a149ae4b9 100644
--- a/file_io/win32/filestat.c
+++ b/file_io/win32/filestat.c
@@ -97,7 +97,7 @@ static void resolve_prot(apr_finfo_t *finfo, apr_int32_t wanted, PACL dacl)
      * there is no reason for os_level testing here.
      */
     if ((wanted & APR_FINFO_WPROT) && !worldid) {
-        SID_IDENTIFIER_AUTHORITY SIDAuth = SECURITY_WORLD_SID_AUTHORITY;
+        SID_IDENTIFIER_AUTHORITY SIDAuth = {SECURITY_WORLD_SID_AUTHORITY};
         if (AllocateAndInitializeSid(&SIDAuth, 1, SECURITY_WORLD_RID,
                                      0, 0, 0, 0, 0, 0, 0, &worldid))
             atexit(free_world);
diff --git a/misc/unix/errorcodes.c b/misc/unix/errorcodes.c
index 4764998c3..75567c246 100644
--- a/misc/unix/errorcodes.c
+++ b/misc/unix/errorcodes.c
@@ -189,56 +189,56 @@ static const struct {
     apr_status_t code;
     const char *msg;
 } gaErrorList[] = {
-    WSAEINTR,           "Interrupted system call",
-    WSAEBADF,           "Bad file number",
-    WSAEACCES,          "Permission denied",
-    WSAEFAULT,          "Bad address",
-    WSAEINVAL,          "Invalid argument",
-    WSAEMFILE,          "Too many open sockets",
-    WSAEWOULDBLOCK,     "Operation would block",
-    WSAEINPROGRESS,     "Operation now in progress",
-    WSAEALREADY,        "Operation already in progress",
-    WSAENOTSOCK,        "Socket operation on non-socket",
-    WSAEDESTADDRREQ,    "Destination address required",
-    WSAEMSGSIZE,        "Message too long",
-    WSAEPROTOTYPE,      "Protocol wrong type for socket",
-    WSAENOPROTOOPT,     "Bad protocol option",
-    WSAEPROTONOSUPPORT, "Protocol not supported",
-    WSAESOCKTNOSUPPORT, "Socket type not supported",
-    WSAEOPNOTSUPP,      "Operation not supported on socket",
-    WSAEPFNOSUPPORT,    "Protocol family not supported",
-    WSAEAFNOSUPPORT,    "Address family not supported",
-    WSAEADDRINUSE,      "Address already in use",
-    WSAEADDRNOTAVAIL,   "Can't assign requested address",
-    WSAENETDOWN,        "Network is down",
-    WSAENETUNREACH,     "Network is unreachable",
-    WSAENETRESET,       "Net connection reset",
-    WSAECONNABORTED,    "Software caused connection abort",
-    WSAECONNRESET,      "Connection reset by peer",
-    WSAENOBUFS,         "No buffer space available",
-    WSAEISCONN,         "Socket is already connected",
-    WSAENOTCONN,        "Socket is not connected",
-    WSAESHUTDOWN,       "Can't send after socket shutdown",
-    WSAETOOMANYREFS,    "Too many references, can't splice",
-    WSAETIMEDOUT,       "Connection timed out",
-    WSAECONNREFUSED,    "Connection refused",
-    WSAELOOP,           "Too many levels of symbolic links",
-    WSAENAMETOOLONG,    "File name too long",
-    WSAEHOSTDOWN,       "Host is down",
-    WSAEHOSTUNREACH,    "No route to host",
-    WSAENOTEMPTY,       "Directory not empty",
-    WSAEPROCLIM,        "Too many processes",
-    WSAEUSERS,          "Too many users",
-    WSAEDQUOT,          "Disc quota exceeded",
-    WSAESTALE,          "Stale NFS file handle",
-    WSAEREMOTE,         "Too many levels of remote in path",
-    WSASYSNOTREADY,     "Network system is unavailable",
-    WSAVERNOTSUPPORTED, "Winsock version out of range",
-    WSANOTINITIALISED,  "WSAStartup not yet called",
-    WSAEDISCON,         "Graceful shutdown in progress",
-    WSAHOST_NOT_FOUND,  "Host not found",
-    WSANO_DATA,         "No host data of that type was found",
-    0,                  NULL
+    {WSAEINTR,           "Interrupted system call"},
+    {WSAEBADF,           "Bad file number"},
+    {WSAEACCES,          "Permission denied"},
+    {WSAEFAULT,          "Bad address"},
+    {WSAEINVAL,          "Invalid argument"},
+    {WSAEMFILE,          "Too many open sockets"},
+    {WSAEWOULDBLOCK,     "Operation would block"},
+    {WSAEINPROGRESS,     "Operation now in progress"},
+    {WSAEALREADY,        "Operation already in progress"},
+    {WSAENOTSOCK,        "Socket operation on non-socket"},
+    {WSAEDESTADDRREQ,    "Destination address required"},
+    {WSAEMSGSIZE,        "Message too long"},
+    {WSAEPROTOTYPE,      "Protocol wrong type for socket"},
+    {WSAENOPROTOOPT,     "Bad protocol option"},
+    {WSAEPROTONOSUPPORT, "Protocol not supported"},
+    {WSAESOCKTNOSUPPORT, "Socket type not supported"},
+    {WSAEOPNOTSUPP,      "Operation not supported on socket"},
+    {WSAEPFNOSUPPORT,    "Protocol family not supported"},
+    {WSAEAFNOSUPPORT,    "Address family not supported"},
+    {WSAEADDRINUSE,      "Address already in use"},
+    {WSAEADDRNOTAVAIL,   "Can't assign requested address"},
+    {WSAENETDOWN,        "Network is down"},
+    {WSAENETUNREACH,     "Network is unreachable"},
+    {WSAENETRESET,       "Net connection reset"},
+    {WSAECONNABORTED,    "Software caused connection abort"},
+    {WSAECONNRESET,      "Connection reset by peer"},
+    {WSAENOBUFS,         "No buffer space available"},
+    {WSAEISCONN,         "Socket is already connected"},
+    {WSAENOTCONN,        "Socket is not connected"},
+    {WSAESHUTDOWN,       "Can't send after socket shutdown"},
+    {WSAETOOMANYREFS,    "Too many references, can't splice"},
+    {WSAETIMEDOUT,       "Connection timed out"},
+    {WSAECONNREFUSED,    "Connection refused"},
+    {WSAELOOP,           "Too many levels of symbolic links"},
+    {WSAENAMETOOLONG,    "File name too long"},
+    {WSAEHOSTDOWN,       "Host is down"},
+    {WSAEHOSTUNREACH,    "No route to host"},
+    {WSAENOTEMPTY,       "Directory not empty"},
+    {WSAEPROCLIM,        "Too many processes"},
+    {WSAEUSERS,          "Too many users"},
+    {WSAEDQUOT,          "Disc quota exceeded"},
+    {WSAESTALE,          "Stale NFS file handle"},
+    {WSAEREMOTE,         "Too many levels of remote in path"},
+    {WSASYSNOTREADY,     "Network system is unavailable"},
+    {WSAVERNOTSUPPORTED, "Winsock version out of range"},
+    {WSANOTINITIALISED,  "WSAStartup not yet called"},
+    {WSAEDISCON,         "Graceful shutdown in progress"},
+    {WSAHOST_NOT_FOUND,  "Host not found"},
+    {WSANO_DATA,         "No host data of that type was found"},
+    {0,                  NULL}
 };
 
 
diff --git a/test/testlfsabi.c b/test/testlfsabi.c
index 6fa39bdac..2c1e963b3 100644
--- a/test/testlfsabi.c
+++ b/test/testlfsabi.c
@@ -26,7 +26,7 @@
 extern void get_type_sizes32(int *res);
 extern void get_type_sizes64(int *res);
 
-void get_type_sizes(int *res)
+static void get_type_sizes(int *res)
 {
 #include "testlfsabi_include.c"
 }
diff --git a/test/testlfsabi.h b/test/testlfsabi.h
index e7c532cc3..32c84e8e7 100644
--- a/test/testlfsabi.h
+++ b/test/testlfsabi.h
@@ -26,3 +26,7 @@
 #define GETSIZE(res, type)  res[(IDX_##type)] = sizeof(type)
 #define CHECKSIZE(tc, res1, res2, type)                         \
   ABTS_INT_EQUAL(tc, res1[(IDX_##type)], res2[(IDX_##type)]);
+
+extern void get_type_sizes32(int *res);
+extern void get_type_sizes64(int *res);
+
diff --git a/user/win32/groupinfo.c b/user/win32/groupinfo.c
index 7739a5428..585642f07 100644
--- a/user/win32/groupinfo.c
+++ b/user/win32/groupinfo.c
@@ -36,11 +36,11 @@ APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *gid,
     DWORD rv;
     char *pos;
 
-    if (pos = strchr(groupname, '/')) {
+    if ((pos = strchr(groupname, '/'))) {
         domain = apr_pstrndup(p, groupname, pos - groupname);
         groupname = pos + 1;
     }
-    else if (pos = strchr(groupname, '\\')) {
+    else if ((pos = strchr(groupname, '\\'))) {
         domain = apr_pstrndup(p, groupname, pos - groupname);
         groupname = pos + 1;
     }
diff --git a/user/win32/userinfo.c b/user/win32/userinfo.c
index d09aaae83..f343d9582 100644
--- a/user/win32/userinfo.c
+++ b/user/win32/userinfo.c
@@ -30,7 +30,7 @@
  * depends on IsValidSid(), which internally we better test long
  * before we get here!
  */
-void get_sid_string(char *buf, apr_size_t blen, apr_uid_t id)
+static void get_sid_string(char *buf, apr_size_t blen, apr_uid_t id)
 {
     PSID_IDENTIFIER_AUTHORITY psia;
     DWORD nsa;