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

Changed error messages

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4343 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-05-05 21:25:06 +00:00
parent baa14504ee
commit 712aabbdac
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/IPhreeqcLib.cpp
View File

@ -66,7 +66,7 @@ UnLoadDatabase(int id)
void void
OutputError(int id) OutputError(int id)
{ {
static const char err_msg[] = "OutputError: Bad instance.\n"; static const char err_msg[] = "OutputError: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)
{ {
@ -79,7 +79,7 @@ OutputError(int id)
void void
OutputWarning(int id) OutputWarning(int id)
{ {
static const char err_msg[] = "OutputWarning: Bad instance.\n"; static const char err_msg[] = "OutputWarning: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)
{ {
@ -92,7 +92,7 @@ OutputWarning(int id)
const char* const char*
GetErrorString(int id) GetErrorString(int id)
{ {
static const char err_msg[] = "GetErrorString: Bad instance.\n"; static const char err_msg[] = "GetErrorString: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)
{ {
@ -104,7 +104,7 @@ GetErrorString(int id)
const char* const char*
GetWarningString(int id) GetWarningString(int id)
{ {
static const char err_msg[] = "GetWarningString: Bad instance.\n"; static const char err_msg[] = "GetWarningString: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)
{ {
@ -139,7 +139,7 @@ GetDumpLineCount(int id)
const char* const char*
GetDumpLine(int id, int n) GetDumpLine(int id, int n)
{ {
static const char err_msg[] = "GetDumpLine: Bad instance.\n"; static const char err_msg[] = "GetDumpLine: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)
{ {
@ -156,13 +156,13 @@ GetComponentCount(int id)
{ {
return IPhreeqcPtr->ListComponents().size(); return IPhreeqcPtr->ListComponents().size();
} }
return 0; return IPQ_BADINSTANCE;
} }
const char* const char*
GetComponent(int id, int n) GetComponent(int id, int n)
{ {
static const char err_msg[] = "GetComponent: Bad instance.\n"; static const char err_msg[] = "GetComponent: Invalid instance id.\n";
static const char empty[] = ""; static const char empty[] = "";
static std::string comp; static std::string comp;
@ -476,7 +476,7 @@ AddError(int id, const char* error_msg)
void void
OutputLines(int id) OutputLines(int id)
{ {
static const char err_msg[] = "OutputLines: Bad instance.\n"; static const char err_msg[] = "OutputLines: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)
{ {
@ -500,7 +500,7 @@ GetErrorLineCount(int id)
const char* const char*
GetErrorLine(int id, int n) GetErrorLine(int id, int n)
{ {
static const char err_msg[] = "GetErrorLine: Bad instance.\n"; static const char err_msg[] = "GetErrorLine: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)
{ {
@ -523,7 +523,7 @@ GetWarningLineCount(int id)
const char* const char*
GetWarningLine(int id, int n) GetWarningLine(int id, int n)
{ {
static const char err_msg[] = "GetWarningLine: Bad instance.\n"; static const char err_msg[] = "GetWarningLine: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)
{ {