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

Added some additional error handling for GetDumpString;

Browse Source 
Changed return value for UnLoadDatabase.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4345 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-05-06 01:31:08 +00:00
parent 166750a340
commit 2f1b9f0d90
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IPhreeqc.cpp
View File

@ -666,6 +666,11 @@ const char* IPhreeqc::GetWarningString(void)
const char* IPhreeqc::GetDumpString(void)
{
static const char err_msg[] = "GetDumpString: DumpStringOn not set.\n";
if (!this->DumpStringOn)
{
return err_msg;
}
return this->DumpString.c_str();
}
@ -1066,7 +1071,11 @@ int IPhreeqc::RunAccumulated(void)
}
}
this->ClearAccumulatedLines();
if (this->PhreeqcPtr->input_error == 0)
{
this->ClearAccumulatedLines();
}
this->PhreeqcPtr->close_output_files();
this->update_errors();

2
IPhreeqcLib.cpp
View File

@ -51,7 +51,7 @@ LoadDatabaseString(int id, const char* input)
return IPQ_BADINSTANCE;
}
int
IPQ_RESULT
UnLoadDatabase(int id)
{
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);