svn commit: r1405523 - /subversion/trunk/subversion/libsvn_subr/config_win.c

[stefan2]

Author: stefan2
Date: Sun Nov  4 10:51:31 2012
New Revision: 1405523

URL: http://svn.apache.org/viewvc?rev=1405523&view=rev
Log:
Fix size and sign conversion warnings in WIN API usage under Win64 by using 
32 bit values where required.  This is safe for us as path lengths and
registry key / values are well below the 2G threshold.

* subversion/libsvn_subr/config_win.c
  (svn_config__win_config_path): string conversion uses int lengths
  (parse_section,
   svn_config__parse_registry): explicitly cast to DWORD

Modified:
    subversion/trunk/subversion/libsvn_subr/config_win.c

Modified: subversion/trunk/subversion/libsvn_subr/config_win.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config_win.c?rev=1405523&r1=1405522&r2=1405523&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/config_win.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config_win.c Sun Nov  4 10:51:31 
2012
@@ -56,7 +56,7 @@ svn_config__win_config_path(const char *
                      | CSIDL_FLAG_CREATE);
 
   WCHAR folder_ucs2[MAX_PATH];
-  apr_size_t inwords, outbytes, outlength;
+  int inwords, outbytes, outlength;
   char *folder_utf8;
 
   if (S_OK != SHGetFolderPathW(NULL, csidl, NULL, SHGFP_TYPE_CURRENT,
@@ -109,7 +109,7 @@ parse_section(svn_config_t *cfg, HKEY hk
   svn_stringbuf_ensure(value, SVN_REG_DEFAULT_VALUE_SIZE);
   for (index = 0; ; ++index)
     {
-      option_len = option->blocksize;
+      option_len = (DWORD)option->blocksize;
       err = RegEnumValue(hkey, index, option->data, &option_len,
                          NULL, &type, NULL, NULL);
       if (err == ERROR_NO_MORE_ITEMS)
@@ -128,7 +128,7 @@ parse_section(svn_config_t *cfg, HKEY hk
          http://subversion.tigris.org/issues/show_bug.cgi?id=671 */
       if (type == REG_SZ && option->data[0] != '#')
         {
-          DWORD value_len = value->blocksize;
+          DWORD value_len = (DWORD)value->blocksize;
           err = RegQueryValueEx(hkey, option->data, NULL, NULL,
                                 (LPBYTE)value->data, &value_len);
           if (err == ERROR_MORE_DATA)
@@ -214,7 +214,7 @@ svn_config__parse_registry(svn_config_t 
   svn_stringbuf_ensure(section, SVN_REG_DEFAULT_NAME_SIZE);
   for (index = 0; ; ++index)
     {
-      DWORD section_len = section->blocksize;
+      DWORD section_len = (DWORD)section->blocksize;
       FILETIME last_write_time;
       HKEY sub_hkey;