Skip to content
Snippets Groups Projects
Commit 5b79c13a authored by Daniel Waggoner's avatar Daniel Waggoner
Browse files

error_dw.c: bug fixes - replaced close with fclose and ensured functions...

error_dw.c: bug fixes - replaced close with fclose and ensured functions return a value when required
(cherry picked from commit 0e178d5e8737794acc2b2ca1b101ddeee9e2c13e)
parent 65ad76ef
Branches
No related tags found
No related merge requests found
...@@ -263,23 +263,26 @@ int dw_CreateErrorMessageFile(char *filename) ...@@ -263,23 +263,26 @@ int dw_CreateErrorMessageFile(char *filename)
dw_ConsoleErrorMessage(); dw_ConsoleErrorMessage();
else else
{ {
if (f_err) close(f_err); if (f_err) fclose(f_err);
if (filename_err) dw_free(filename_err); if (filename_err) dw_free(filename_err);
if (f_err=fopen(filename,"wt")) if (f_err=fopen(filename,"wt"))
{ if (filename_err=(char*)malloc(strlen(filename)+1))
if (filename_err=(char*)malloc(strlen(filename)+1)) {
strcpy(filename_err,filename); strcpy(filename_err,filename);
else return 1;
}
else
{
dw_Error(MEM_ERR); dw_Error(MEM_ERR);
return 1; dw_ConsoleErrorMessage();
} }
else else
{ {
filename_err=(char*)NULL; filename_err=(char*)NULL;
dw_FileError(FILE_OPEN_ERR,filename); dw_FileError(FILE_OPEN_ERR,filename);
return 0;
} }
} }
return 0;
} }
/* /*
...@@ -292,23 +295,26 @@ int dw_AppendErrorMessageFile(char *filename) ...@@ -292,23 +295,26 @@ int dw_AppendErrorMessageFile(char *filename)
dw_ConsoleErrorMessage(); dw_ConsoleErrorMessage();
else else
{ {
if (f_err) close(f_err); if (f_err) fclose(f_err);
if (filename_err) dw_free(filename_err); if (filename_err) dw_free(filename_err);
if (f_err=fopen(filename,"at")) if (f_err=fopen(filename,"at"))
{ if (filename_err=(char*)malloc(strlen(filename)+1))
if (filename_err=(char*)malloc(strlen(filename)+1)) {
strcpy(filename_err,filename); strcpy(filename_err,filename);
else return 1;
}
else
{
dw_Error(MEM_ERR); dw_Error(MEM_ERR);
return 1; dw_ConsoleErrorMessage();
} }
else else
{ {
filename_err=(char*)NULL; filename_err=(char*)NULL;
dw_FileError(FILE_OPEN_ERR,filename); dw_FileError(FILE_OPEN_ERR,filename);
return 0;
} }
} }
return 0;
} }
/* /*
...@@ -316,7 +322,7 @@ int dw_AppendErrorMessageFile(char *filename) ...@@ -316,7 +322,7 @@ int dw_AppendErrorMessageFile(char *filename)
*/ */
void dw_ConsoleErrorMessage(void) void dw_ConsoleErrorMessage(void)
{ {
if (f_err) close(f_err); if (f_err) fclose(f_err);
if (filename_err) dw_free(filename_err); if (filename_err) dw_free(filename_err);
f_err=(FILE*)NULL; f_err=(FILE*)NULL;
filename_err=(char*)NULL; filename_err=(char*)NULL;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment