diff options
Diffstat (limited to 'subversion/libsvn_subr/config_win.c')
| -rw-r--r-- | subversion/libsvn_subr/config_win.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/subversion/libsvn_subr/config_win.c b/subversion/libsvn_subr/config_win.c index c35ad47..0a15129 100644 --- a/subversion/libsvn_subr/config_win.c +++ b/subversion/libsvn_subr/config_win.c @@ -56,7 +56,7 @@ svn_config__win_config_path(const char **folder, int system_path, | 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 hkey, const char *section, 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 hkey, const char *section, 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) @@ -200,9 +200,9 @@ svn_config__parse_registry(svn_config_t *cfg, const char *file, subpool = svn_pool_create(pool); - section = svn_stringbuf_create("", subpool); - option = svn_stringbuf_create("", subpool); - value = svn_stringbuf_create("", subpool); + section = svn_stringbuf_create_empty(subpool); + option = svn_stringbuf_create_empty(subpool); + value = svn_stringbuf_create_empty(subpool); /* The top-level values belong to the [DEFAULT] section */ svn_err = parse_section(cfg, hkey, SVN_CONFIG__DEFAULT_SECTION, @@ -214,19 +214,18 @@ svn_config__parse_registry(svn_config_t *cfg, const char *file, svn_stringbuf_ensure(section, SVN_REG_DEFAULT_NAME_SIZE); for (index = 0; ; ++index) { - DWORD section_len = section->blocksize; - FILETIME last_write_time; + DWORD section_len = (DWORD)section->blocksize; HKEY sub_hkey; err = RegEnumKeyEx(hkey, index, section->data, §ion_len, - NULL, NULL, NULL, &last_write_time); + NULL, NULL, NULL, NULL); if (err == ERROR_NO_MORE_ITEMS) break; if (err == ERROR_MORE_DATA) { svn_stringbuf_ensure(section, section_len); err = RegEnumKeyEx(hkey, index, section->data, §ion_len, - NULL, NULL, NULL, &last_write_time); + NULL, NULL, NULL, NULL); } if (err != ERROR_SUCCESS) { |