[PATCH 3/4 v2] regedit: Return success or failure from import functions
Hugh McMaster
hugh.mcmaster at outlook.com
Wed Mar 22 06:54:16 CDT 2017
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
programs/regedit/regproc.c | 35 +++++++++++++++--------------------
1 file changed, 15 insertions(+), 20 deletions(-)
diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index 8029239..f7c30b3 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -746,7 +746,7 @@ static char *get_lineA(FILE *fp)
return NULL;
}
-static void processRegLinesA(FILE *fp, char *two_chars)
+static BOOL processRegLinesA(FILE *fp, char *two_chars)
{
char *line, *header;
WCHAR *lineW;
@@ -767,7 +767,7 @@ static void processRegLinesA(FILE *fp, char *two_chars)
if (reg_version == REG_VERSION_INVALID)
{
get_lineA(NULL); /* Reset static variables */
- return;
+ return FALSE;
}
while ((line = get_lineA(fp)))
@@ -783,6 +783,7 @@ static void processRegLinesA(FILE *fp, char *two_chars)
}
closeKey();
+ return TRUE;
}
static WCHAR *get_lineW(FILE *fp)
@@ -857,7 +858,7 @@ static WCHAR *get_lineW(FILE *fp)
return NULL;
}
-static void processRegLinesW(FILE *fp)
+static BOOL processRegLinesW(FILE *fp)
{
WCHAR *line;
int reg_version;
@@ -867,13 +868,14 @@ static void processRegLinesW(FILE *fp)
if (reg_version == REG_VERSION_INVALID)
{
get_lineW(NULL); /* Reset static variables */
- return;
+ return FALSE;
}
while ((line = get_lineW(fp)))
processRegEntry(line, TRUE);
closeKey();
+ return TRUE;
}
/******************************************************************************
@@ -1349,22 +1351,15 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format)
*/
BOOL import_registry_file(FILE* reg_file)
{
- if (reg_file)
- {
- BYTE s[2];
- if (fread( s, 2, 1, reg_file) == 1)
- {
- if (s[0] == 0xff && s[1] == 0xfe)
- {
- processRegLinesW(reg_file);
- } else
- {
- processRegLinesA(reg_file, (char*)s);
- }
- }
- return TRUE;
- }
- return FALSE;
+ BYTE s[2];
+
+ if (!reg_file || (fread(s, 2, 1, reg_file) != 1))
+ return FALSE;
+
+ if (s[0] == 0xff && s[1] == 0xfe)
+ return processRegLinesW(reg_file);
+ else
+ return processRegLinesA(reg_file, (char *)s);
}
/******************************************************************************
--
2.7.4
More information about the wine-patches
mailing list