From: Guenter Knauf <fuankg@apache.org>
Date: Sun, 8 Aug 2010 13:27:59 +0000 (+0000)
Subject: Added casts to silent compiler warnings.
X-Git-Tag: 2.3.7~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81dac39aabe14f1cd592654d88f9693f44d482ec;p=thirdparty%2Fapache%2Fhttpd.git

Added casts to silent compiler warnings.


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

diff --git a/os/win32/ap_regkey.c b/os/win32/ap_regkey.c
index ea5a56d3795..3951f90a608 100644
--- a/os/win32/ap_regkey.c
+++ b/os/win32/ap_regkey.c
@@ -363,7 +363,7 @@ AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result,
         else if (valuelen)
             return APR_ENAMETOOLONG;
         /* Read to NULL buffer to determine value size */
-        rc = RegQueryValueExW(key->hkey, wvalname, 0, resulttype,
+        rc = RegQueryValueExW(key->hkey, wvalname, 0, (LPDWORD)resulttype,
                               NULL, (LPDWORD)resultsize);
         if (rc != ERROR_SUCCESS) {
             return APR_FROM_OS_ERROR(rc);
@@ -371,7 +371,7 @@ AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result,
 
         /* Read value based on size query above */
         *result = apr_palloc(pool, *resultsize);
-        rc = RegQueryValueExW(key->hkey, wvalname, 0, resulttype,
+        rc = RegQueryValueExW(key->hkey, wvalname, 0, (LPDWORD)resulttype,
                              (LPBYTE)*result, (LPDWORD)resultsize);
     }
 #endif /* APR_HAS_UNICODE_FS */
@@ -379,14 +379,14 @@ AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result,
     ELSE_WIN_OS_IS_ANSI
     {
         /* Read to NULL buffer to determine value size */
-        rc = RegQueryValueEx(key->hkey, valuename, 0, resulttype,
+        rc = RegQueryValueEx(key->hkey, valuename, 0, (LPDWORD)resulttype,
                              NULL, (LPDWORD)resultsize);
         if (rc != ERROR_SUCCESS)
             return APR_FROM_OS_ERROR(rc);
 
         /* Read value based on size query above */
         *result = apr_palloc(pool, *resultsize);
-        rc = RegQueryValueEx(key->hkey, valuename, 0, resulttype,
+        rc = RegQueryValueEx(key->hkey, valuename, 0, (LPDWORD)resulttype,
                              (LPBYTE)*result, (LPDWORD)resultsize);
         if (rc != ERROR_SUCCESS)
             return APR_FROM_OS_ERROR(rc);
@@ -452,7 +452,7 @@ AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result,
     void *value;
     char *buf;
     char *tmp;
-    DWORD type;
+    apr_int32_t type;
     apr_size_t size = 0;
 
     rv = ap_regkey_value_raw_get(&value, &size, &type, key, valuename, pool);