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

renamed *2 routines without the 2

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4224 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-04-07 21:41:55 +00:00
parent 57c0ad5a75
commit bd84d6358c
2 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/IPhreeqc2.h
View File

@ -79,18 +79,16 @@ public:
bool GetSelectedOutputOn(void)const;
void SetSelectedOutputOn(bool bValue);
// IPhreeqc.cpp
static int handler2(const int action, const int type, const char *err_str, const int stop, void *cookie, const char *format, va_list args);
int output_handler2(const int type, const char *err_str, const int stop, void *cookie, const char *format, va_list args);
int open_handler2(const int type, const char *file_name);
protected:
static int handler(const int action, const int type, const char *err_str, const int stop, void *cookie, const char *format, va_list args);
int output_handler(const int type, const char *err_str, const int stop, void *cookie, const char *format, va_list args);
int open_handler(const int type, const char *file_name);
// module_files.c
static int module_handler2(const int action, const int type, const char *err_str, const int stop, void *cookie, const char *format, va_list args);
int module_isopen_handler2(const int type);
int module_open_handler2(const int type, const char *file_name);
static int module_handler(const int action, const int type, const char *err_str, const int stop, void *cookie, const char *format, va_list args);
int module_isopen_handler(const int type);
int module_open_handler(const int type, const char *file_name);
// module_output.c
int output_isopen2(const int type);
int output_isopen(const int type);
int EndRow(void);
void AddSelectedOutput(const char* name, const char* format, va_list argptr);
@ -98,10 +96,8 @@ public:
void check_database(const char* sz_routine);
void do_run(const char* sz_routine, std::istream* pis, FILE* fp, PFN_PRERUN_CALLBACK pfn_pre, PFN_POSTRUN_CALLBACK pfn_post, void *cookie);
protected:
void update_errors(void);
protected:
bool DatabaseLoaded;
bool SelectedOutputOn;

44
src/IPhreeqc2.cpp
View File

@ -60,22 +60,22 @@ IPhreeqc2::~IPhreeqc2(void)
delete this->PhreeqcPtr;
}
int IPhreeqc2::handler2(const int action, const int type, const char *err_str, const int stop, void *cookie, const char *format, va_list args)
int IPhreeqc2::handler(const int action, const int type, const char *err_str, const int stop, void *cookie, const char *format, va_list args)
{
int n = OK;
IPhreeqc2 *pThis = (IPhreeqc2*)cookie;
switch (action)
{
case Phreeqc::ACTION_OPEN:
n = pThis->open_handler2(type, err_str);
n = pThis->open_handler(type, err_str);
break;
case Phreeqc::ACTION_OUTPUT:
n = pThis->output_handler2(type, err_str, stop, cookie, format, args);
n = pThis->output_handler(type, err_str, stop, cookie, format, args);
break;
default:
n = pThis->module_handler2(action, type, err_str, stop, cookie, format, args);
n = pThis->module_handler(action, type, err_str, stop, cookie, format, args);
break;
}
@ -86,7 +86,7 @@ int IPhreeqc2::handler2(const int action, const int type, const char *err_str, c
return n;
}
int IPhreeqc2::output_handler2(const int type, const char *err_str, const int stop, void *cookie, const char *format, va_list args)
int IPhreeqc2::output_handler(const int type, const char *err_str, const int stop, void *cookie, const char *format, va_list args)
{
assert(cookie == this);
@ -123,10 +123,10 @@ int IPhreeqc2::output_handler2(const int type, const char *err_str, const int st
break;
}
return module_handler2(Phreeqc::ACTION_OUTPUT, type, err_str, stop, cookie, format, args);
return module_handler(Phreeqc::ACTION_OUTPUT, type, err_str, stop, cookie, format, args);
}
int IPhreeqc2::open_handler2(const int type, const char *file_name)
int IPhreeqc2::open_handler(const int type, const char *file_name)
{
int n = OK;
switch (type)
@ -141,27 +141,27 @@ int IPhreeqc2::open_handler2(const int type, const char *file_name)
}
if (this->SelectedOutputOn)
{
n = module_handler2(Phreeqc::ACTION_OPEN, type, file_name, CONTINUE, this, NULL, NULL);
n = module_handler(Phreeqc::ACTION_OPEN, type, file_name, CONTINUE, this, NULL, NULL);
}
break;
default:
n = module_handler2(Phreeqc::ACTION_OPEN, type, file_name, CONTINUE, this, NULL, NULL);
n = module_handler(Phreeqc::ACTION_OPEN, type, file_name, CONTINUE, this, NULL, NULL);
break;
}
return n;
}
int IPhreeqc2::module_handler2(const int action, const int type, const char *err_str, const int stop, void *cookie, const char *format, va_list args)
int IPhreeqc2::module_handler(const int action, const int type, const char *err_str, const int stop, void *cookie, const char *format, va_list args)
{
IPhreeqc2* pThis = (IPhreeqc2*) cookie;
switch (action)
{
case Phreeqc::ACTION_OPEN:
return pThis->module_open_handler2(type, err_str);
return pThis->module_open_handler(type, err_str);
break;
case ACTION_ISOPEN:
return pThis->module_isopen_handler2(type);
return pThis->module_isopen_handler(type);
break;
default:
return pThis->PhreeqcPtr->phreeqc_handler(action, type, err_str, stop, pThis->PhreeqcPtr, format, args);
@ -170,7 +170,7 @@ int IPhreeqc2::module_handler2(const int action, const int type, const char *err
return ERROR;
}
int IPhreeqc2::module_isopen_handler2(const int type)
int IPhreeqc2::module_isopen_handler(const int type)
{
switch (type)
{
@ -183,7 +183,7 @@ int IPhreeqc2::module_isopen_handler2(const int type)
return 0;
}
int IPhreeqc2::module_open_handler2(const int type, const char *file_name)
int IPhreeqc2::module_open_handler(const int type, const char *file_name)
{
assert(file_name && ::strlen(file_name));
switch (type)
@ -233,7 +233,7 @@ int IPhreeqc2::module_open_handler2(const int type, const char *file_name)
return(OK);
}
int IPhreeqc2::output_isopen2(const int type)
int IPhreeqc2::output_isopen(const int type)
{
size_t i;
int isopen;
@ -405,7 +405,7 @@ void IPhreeqc2::UnLoadDatabase(void)
// initialize phreeqc
//
this->PhreeqcPtr->clean_up();
this->PhreeqcPtr->add_output_callback(IPhreeqc2::handler2, this);
this->PhreeqcPtr->add_output_callback(IPhreeqc2::handler, this);
this->PhreeqcPtr->do_initialize();
this->PhreeqcPtr->input_error = 0;
}
@ -798,7 +798,7 @@ void IPhreeqc2::do_run(const char* sz_routine, std::istream* pis, FILE* fp, PFN_
// TRUE ???
//
//
if (!this->SelectedOutputOn) ASSERT(!this->output_isopen2(Phreeqc::OUTPUT_PUNCH));
if (!this->SelectedOutputOn) ASSERT(!this->output_isopen(Phreeqc::OUTPUT_PUNCH));
if (this->PhreeqcPtr->pr.punch == FALSE)
{
@ -812,7 +812,7 @@ void IPhreeqc2::do_run(const char* sz_routine, std::istream* pis, FILE* fp, PFN_
{
if (this->PhreeqcPtr->punch.new_def == FALSE)
{
if (this->SelectedOutputOn && !this->output_isopen2(Phreeqc::OUTPUT_PUNCH))
if (this->SelectedOutputOn && !this->output_isopen(Phreeqc::OUTPUT_PUNCH))
{
//
// LoadDatabase
@ -821,7 +821,7 @@ void IPhreeqc2::do_run(const char* sz_routine, std::istream* pis, FILE* fp, PFN_
//
std::string filename = this->PunchFileName;
this->PhreeqcPtr->output_open(Phreeqc::OUTPUT_PUNCH, filename.c_str());
if (!this->output_isopen2(Phreeqc::OUTPUT_PUNCH))
if (!this->output_isopen(Phreeqc::OUTPUT_PUNCH))
{
std::ostringstream oss;
oss << sz_routine << ": Unable to open:" << "\"" << filename << "\".\n";
@ -837,7 +837,7 @@ void IPhreeqc2::do_run(const char* sz_routine, std::istream* pis, FILE* fp, PFN_
}
else
{
if (this->SelectedOutputOn && !this->output_isopen2(Phreeqc::OUTPUT_PUNCH))
if (this->SelectedOutputOn && !this->output_isopen(Phreeqc::OUTPUT_PUNCH))
{
// This is a special case which could not occur in
// phreeqc
@ -852,7 +852,7 @@ void IPhreeqc2::do_run(const char* sz_routine, std::istream* pis, FILE* fp, PFN_
filename = this->PunchFileName;
}
this->PhreeqcPtr->output_open(Phreeqc::OUTPUT_PUNCH, filename.c_str());
if (!this->output_isopen2(Phreeqc::OUTPUT_PUNCH))
if (!this->output_isopen(Phreeqc::OUTPUT_PUNCH))
{
std::ostringstream oss;
oss << sz_routine << ": Unable to open:" << "\"" << filename << "\".\n";
@ -869,7 +869,7 @@ void IPhreeqc2::do_run(const char* sz_routine, std::istream* pis, FILE* fp, PFN_
}
}
if (!this->SelectedOutputOn) ASSERT(!this->output_isopen2(Phreeqc::OUTPUT_PUNCH));
if (!this->SelectedOutputOn) ASSERT(!this->output_isopen(Phreeqc::OUTPUT_PUNCH));
/* the converse is not necessarily true */
this->PhreeqcPtr->n_user_punch_index = -1;