max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed longjmp to throw for PHREEQC_CLASS

Browse Source 
added some safe_close for PHRQ_io.cpp

added isopen_handler

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5663 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2011-09-29 23:22:18 +00:00
parent 9201846ce1
commit 4d3231479e
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PHRQ_base.cxx
View File

@ -36,7 +36,7 @@ error_msg(const std::string & stdstr, int stop)
}
if (stop != 0)
{
throw "PHRQ_base error message";
throw PhreeqcStop();
}
}

37
PHRQ_io.cpp
View File

@ -413,17 +413,23 @@ open_handler(const int type, const char *file_name)
//return ERROR;
return 0;
}
else
break;
case OUTPUT_MESSAGE:
if (output_file != NULL)
{
//free_check_null(selected_output_file_name);
//selected_output_file_name = string_duplicate(file_name);
safe_close(output_file);
output_file = NULL;
}
if ((output_file = fopen(file_name, "w")) == NULL)
{
//return ERROR;
return 0;
}
break;
case OUTPUT_DUMP:
if (dump_file != NULL)
{
fclose(dump_file);
safe_close(dump_file);
dump_file = NULL;
}
if ((dump_file = fopen(file_name, "w")) == NULL)
@ -431,20 +437,14 @@ open_handler(const int type, const char *file_name)
//return ERROR;
return 0;
}
else
{
//free_check_null(dump_file_name);
//dump_file_name = string_duplicate(file_name);
}
break;
case OUTPUT_ERROR:
if (error_file != NULL &&
error_file != stderr &&
error_file != stdout)
if (error_file != NULL)
{
fclose(error_file);
safe_close(error_file);
error_file = NULL;
}
if (file_name != NULL)
{
if ((error_file = fopen(file_name, "w")) == NULL)
@ -459,11 +459,9 @@ open_handler(const int type, const char *file_name)
}
break;
case OUTPUT_LOG:
if (log_file != NULL &&
log_file != stderr &&
log_file != stdout)
if (log_file != NULL)
{
fclose(log_file);
safe_close(log_file);
log_file = NULL;
}
if ((log_file = fopen(file_name, "w")) == NULL)
@ -592,7 +590,8 @@ safe_close(FILE * file_ptr)
{
if (file_ptr != stderr &&
file_ptr != stdout &&
file_ptr != stdin)
file_ptr != stdin &&
file_ptr != NULL)
{
fclose(file_ptr);
}

4
PHRQ_io.h
View File

@ -2,7 +2,9 @@
#define _PHRQIO_H
#include <sstream>
class PhreeqcStop : std::exception
{
};
class PHRQ_io
{
public: