Commit d37375e4 authored by Hugh McMaster's avatar Hugh McMaster Committed by Alexandre Julliard

reg: Use 'argvW' array naming in export.c.

parent 4cbf4705
...@@ -360,7 +360,7 @@ static BOOL is_overwrite_switch(const WCHAR *s) ...@@ -360,7 +360,7 @@ static BOOL is_overwrite_switch(const WCHAR *s)
return is_switch(s, 'y'); return is_switch(s, 'y');
} }
int reg_export(int argc, WCHAR *argv[]) int reg_export(int argc, WCHAR *argvW[])
{ {
HKEY root, hkey; HKEY root, hkey;
WCHAR *path, *long_key; WCHAR *path, *long_key;
...@@ -371,10 +371,10 @@ int reg_export(int argc, WCHAR *argv[]) ...@@ -371,10 +371,10 @@ int reg_export(int argc, WCHAR *argv[])
if (argc == 3 || argc > 5) if (argc == 3 || argc > 5)
goto error; goto error;
if (!parse_registry_key(argv[2], &root, &path, &long_key)) if (!parse_registry_key(argvW[2], &root, &path, &long_key))
return 1; return 1;
if (argc == 5 && !(overwrite_file = is_overwrite_switch(argv[4]))) if (argc == 5 && !(overwrite_file = is_overwrite_switch(argvW[4])))
goto error; goto error;
if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey))
...@@ -383,7 +383,7 @@ int reg_export(int argc, WCHAR *argv[]) ...@@ -383,7 +383,7 @@ int reg_export(int argc, WCHAR *argv[])
return 1; return 1;
} }
hFile = get_file_handle(argv[3], overwrite_file); hFile = get_file_handle(argvW[3], overwrite_file);
export_file_header(hFile); export_file_header(hFile);
ret = export_registry_data(hFile, hkey, long_key); ret = export_registry_data(hFile, hkey, long_key);
export_newline(hFile); export_newline(hFile);
...@@ -395,6 +395,6 @@ int reg_export(int argc, WCHAR *argv[]) ...@@ -395,6 +395,6 @@ int reg_export(int argc, WCHAR *argv[])
error: error:
output_message(STRING_INVALID_SYNTAX); output_message(STRING_INVALID_SYNTAX);
output_message(STRING_FUNC_HELP, wcsupr(argv[1])); output_message(STRING_FUNC_HELP, wcsupr(argvW[1]));
return 1; return 1;
} }
...@@ -53,7 +53,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, ...@@ -53,7 +53,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name,
BOOL value_empty, BOOL value_all, BOOL force); BOOL value_empty, BOOL value_all, BOOL force);
/* export.c */ /* export.c */
int reg_export(int argc, WCHAR *argv[]); int reg_export(int argc, WCHAR *argvW[]);
/* import.c */ /* import.c */
int reg_import(int argc, WCHAR *argvW[]); int reg_import(int argc, WCHAR *argvW[]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment