JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fixes non-camelcase convention

Browse Source 
and adds rich corinthian vintage-style (projectless) function declarations
This commit is contained in:
Sam Hatchett
2022-08-08 11:58:09 -04:00
parent 41887e9016
commit b139684164
4 changed files with 68 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/epanet2.h
View File

@@ -159,6 +159,10 @@ extern "C" {
int DLLEXPORT ENgetresultindex(int type, int index, int *value); int DLLEXPORT ENgetresultindex(int type, int index, int *value);
int DLLEXPORT ENsetreportcallback(void (*callback)(void *userData, void *EN_projectHandle, char*));
int DLLEXPORT ENsetreportcallbackuserdata(void *userData);
/******************************************************************** /********************************************************************
Analysis Options Functions Analysis Options Functions

4
include/epanet2_2.h
View File

@@ -526,8 +526,8 @@ typedef struct Project *EN_Project;
use the userData parameter to pass any client context necessary (a context pointer or wrapper object perhaps). use the userData parameter to pass any client context necessary (a context pointer or wrapper object perhaps).
Leave un-set or set the report callback to NULL to revert to EPANET's default behavior. Leave un-set or set the report callback to NULL to revert to EPANET's default behavior.
**/ **/
int DLLEXPORT EN_setReportCallback(EN_Project ph, void (*callback)(void *userData, void *EN_projectHandle, char*)); int DLLEXPORT EN_setreportcallback(EN_Project ph, void (*callback)(void *userData, void *EN_projectHandle, char*));
int DLLEXPORT EN_setReportCallbackUserData(EN_Project ph, void *userData); int DLLEXPORT EN_setreportcallbackuserdata(EN_Project ph, void *userData);
/** /**
@brief Writes a line of text to a project's report file. @brief Writes a line of text to a project's report file.

4
src/epanet.c
View File

@@ -842,13 +842,13 @@ int DLLEXPORT EN_closeQ(EN_Project p)
********************************************************************/ ********************************************************************/
int DLLEXPORT EN_setReportCallback(EN_Project p, void (*callback)(void*,void*,char*)) int DLLEXPORT EN_setreportcallback(EN_Project p, void (*callback)(void*,void*,char*))
{ {
p->report.reportCallback = callback; p->report.reportCallback = callback;
return 0; return 0;
} }
int DLLEXPORT EN_setReportCallbackUserData(EN_Project p, void *userData) int DLLEXPORT EN_setreportcallbackuserdata(EN_Project p, void *userData)
{ {
p->report.reportCallbackUserData = userData; p->report.reportCallbackUserData = userData;
return 0; return 0;

10
src/epanet2.c
View File

@@ -212,6 +212,16 @@ int DLLEXPORT ENsetstatusreport(int level)
return EN_setstatusreport(_defaultProject, level); return EN_setstatusreport(_defaultProject, level);
} }
int DLLEXPORT ENsetreportcallback(void (*callback)(void *userData, void *EN_projectHandle, char*))
{
return EN_setreportcallback(_defaultProject, callback);
}
int DLLEXPORT ENsetreportcallbackuserdata(void *userData)
{
return EN_setreportcallbackuserdata(_defaultProject, userData);
}
int DLLEXPORT ENgetversion(int *version) { return EN_getversion(version); } int DLLEXPORT ENgetversion(int *version) { return EN_getversion(version); }
int DLLEXPORT ENgeterror(int errcode, char *errmsg, int maxLen) int DLLEXPORT ENgeterror(int errcode, char *errmsg, int maxLen)