From ddd08e3d5f9beb4388f44fee2bee0857ae7edd1d Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Fri, 2 Feb 2018 10:52:32 -0500
Subject: [PATCH] Conforming to pointer declaration style.

---
 include/epanet2.h |   8 +-
 src/epanet.c      | 194 +++++++++++++++++++++++-----------------------
 src/vars.h        |   2 +-
 3 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/include/epanet2.h b/include/epanet2.h
index 617d71f..d5f0aab 100644
--- a/include/epanet2.h
+++ b/include/epanet2.h
@@ -266,7 +266,7 @@ extern "C" {
   /**
    @brief The EPANET Project wrapper object
    */
-  typedef void* EN_ProjectHandle;
+  typedef void *EN_ProjectHandle;
 //  typedef struct EN_Project EN_Project;
   typedef struct EN_Pattern EN_Pattern;
   typedef struct EN_Curve EN_Curve;
@@ -1125,10 +1125,10 @@ extern "C" {
    Threadsafe versions of all epanet functions
    
    ***************************************************/
-  int DLLEXPORT EN_alloc(EN_ProjectHandle* ph);
-  int DLLEXPORT EN_free(EN_ProjectHandle* ph);
+  int DLLEXPORT EN_alloc(EN_ProjectHandle *ph);
+  int DLLEXPORT EN_free(EN_ProjectHandle *ph);
 
-  int DLLEXPORT EN_init(EN_ProjectHandle* ph, char *rptFile, char *binOutFile,
+  int DLLEXPORT EN_init(EN_ProjectHandle *ph, char *rptFile, char *binOutFile,
           EN_FlowUnits UnitsType, EN_FormType HeadlossFormula);
 
   int DLLEXPORT EN_open(EN_ProjectHandle ph, const char *inpFile,
diff --git a/src/epanet.c b/src/epanet.c
index 9129281..5b1d7db 100644
--- a/src/epanet.c
+++ b/src/epanet.c
@@ -154,7 +154,7 @@ execute function x and set the error code equal to its return value.
 int DLLEXPORT ENepanet(char *f1, char *f2, char *f3, void (*pviewprog)(char *))
 {
   int errcode = 0;
-  EN_Project* _p;
+  EN_Project *_p;
 
   ERRCODE(EN_alloc(&_defaultModel));
   ERRCODE(EN_open(_defaultModel, f1, f2, f3));
@@ -169,7 +169,7 @@ int DLLEXPORT ENepanet(char *f1, char *f2, char *f3, void (*pviewprog)(char *))
   ERRCODE(EN_solveQ(_defaultModel));
   ERRCODE(EN_report(_defaultModel));
   EN_close(_defaultModel);
-  EN_free(_defaultModel);
+  EN_free(&_defaultModel);
 
   return (errcode);
 }
@@ -459,7 +459,7 @@ int DLLEXPORT ENdeletenode(int index) {
 */
 
 /// allocate a project pointer
-int DLLEXPORT EN_alloc(EN_ProjectHandle* ph)
+int DLLEXPORT EN_alloc(EN_ProjectHandle *ph)
 {
   EN_Project *project = calloc(1, sizeof(EN_Project));
   *ph = project;
@@ -467,9 +467,9 @@ int DLLEXPORT EN_alloc(EN_ProjectHandle* ph)
   return 0;
 }
 
-int DLLEXPORT EN_free(EN_ProjectHandle* ph)
+int DLLEXPORT EN_free(EN_ProjectHandle *ph)
 {
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)(*ph);
 
   free(p);
 
@@ -478,7 +478,7 @@ int DLLEXPORT EN_free(EN_ProjectHandle* ph)
   return 0;
 }
 
-int DLLEXPORT EN_init(EN_ProjectHandle* ph, char *f2, char *f3,
+int DLLEXPORT EN_init(EN_ProjectHandle *ph, char *f2, char *f3,
                       EN_FlowUnits UnitsType, EN_FormType HeadlossFormula)
 /*----------------------------------------------------------------
  **  Input:
@@ -500,7 +500,7 @@ int DLLEXPORT EN_init(EN_ProjectHandle* ph, char *f2, char *f3,
   _fpreset();
 #endif
 
-  EN_Project* pr = (EN_Project*)*ph;
+  EN_Project *pr = (EN_Project*)*ph;
 
 
   /* Set system flags */
@@ -559,7 +559,7 @@ int DLLEXPORT EN_open(EN_ProjectHandle ph, const char *f1, const char *f2, const
   _fpreset();
 #endif
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Set system flags */
   p->Openflag = FALSE;
@@ -624,7 +624,7 @@ int DLLEXPORT EN_saveinpfile(EN_ProjectHandle ph, char *filename)
  **----------------------------------------------------------------
  */
 {
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   if (!p->Openflag)
     return (102);
@@ -642,7 +642,7 @@ int DLLEXPORT EN_close(EN_ProjectHandle ph)
 {
   out_file_t *out;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
   
   if (p->Openflag) {
     writetime(p, FMT105);
@@ -707,7 +707,7 @@ int DLLEXPORT EN_solveH(EN_ProjectHandle ph)
   int errcode;
   long t, tstep;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Open hydraulics solver */
   errcode = EN_openH(ph);
@@ -765,7 +765,7 @@ int DLLEXPORT EN_saveH(EN_ProjectHandle ph)
   char tmpflag;
   int errcode;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Check if hydraulic results exist */
   if (!p->save_options.SaveHflag)
@@ -799,7 +799,7 @@ int DLLEXPORT EN_openH(EN_ProjectHandle ph)
 {
   int errcode = 0;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Check that input data exists */
   p->hydraulics.OpenHflag = FALSE;
@@ -838,7 +838,7 @@ int DLLEXPORT EN_initH(EN_ProjectHandle ph, int flag)
   int errcode = 0;
   int sflag, fflag;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Reset status flags */
   p->save_options.SaveHflag = FALSE;
@@ -872,7 +872,7 @@ int DLLEXPORT EN_initH(EN_ProjectHandle ph, int flag)
 int DLLEXPORT EN_runH(EN_ProjectHandle ph, long *t) {
   int errcode;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *t = 0;
   if (!p->hydraulics.OpenHflag)
@@ -886,7 +886,7 @@ int DLLEXPORT EN_runH(EN_ProjectHandle ph, long *t) {
 int DLLEXPORT EN_nextH(EN_ProjectHandle ph, long *tstep) {
   int errcode;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *tstep = 0;
   if (!p->hydraulics.OpenHflag)
@@ -901,7 +901,7 @@ int DLLEXPORT EN_nextH(EN_ProjectHandle ph, long *tstep) {
 
 int DLLEXPORT EN_closeH(EN_ProjectHandle ph)
 {
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   if (!p->Openflag) {
     return (102);
@@ -918,7 +918,7 @@ int DLLEXPORT EN_savehydfile(EN_ProjectHandle ph, char *filename) {
   int c;
   FILE *HydFile;
   
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Check that hydraulics results exist */
   if (p->out_files.HydFile == NULL || !p->save_options.SaveHflag)
@@ -941,7 +941,7 @@ int DLLEXPORT EN_savehydfile(EN_ProjectHandle ph, char *filename) {
 int DLLEXPORT EN_usehydfile(EN_ProjectHandle ph, char *filename) {
   int errcode;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Check that input data exists & hydraulics system closed */
   if (!p->Openflag)
@@ -974,7 +974,7 @@ int DLLEXPORT EN_solveQ(EN_ProjectHandle ph) {
   int errcode;
   long t, tstep;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Open WQ solver */
   errcode = EN_openQ(ph);
@@ -1026,7 +1026,7 @@ int DLLEXPORT EN_solveQ(EN_ProjectHandle ph) {
 int DLLEXPORT EN_openQ(EN_ProjectHandle ph) {
   int errcode = 0;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Check that hydraulics results exist */
   p->quality.OpenQflag = FALSE;
@@ -1048,7 +1048,7 @@ int DLLEXPORT EN_openQ(EN_ProjectHandle ph) {
 int DLLEXPORT EN_initQ(EN_ProjectHandle ph, int saveflag) {
   int errcode = 0;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   if (!p->quality.OpenQflag)
     return (105);
@@ -1066,7 +1066,7 @@ int DLLEXPORT EN_initQ(EN_ProjectHandle ph, int saveflag) {
 int DLLEXPORT EN_runQ(EN_ProjectHandle ph, long *t) {
   int errcode;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *t = 0;
   if (!p->quality.OpenQflag)
@@ -1080,7 +1080,7 @@ int DLLEXPORT EN_runQ(EN_ProjectHandle ph, long *t) {
 int DLLEXPORT EN_nextQ(EN_ProjectHandle ph, long *tstep) {
   int errcode;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *tstep = 0;
   if (!p->quality.OpenQflag)
@@ -1097,7 +1097,7 @@ int DLLEXPORT EN_nextQ(EN_ProjectHandle ph, long *tstep) {
 int DLLEXPORT EN_stepQ(EN_ProjectHandle ph, long *tleft) {
   int errcode;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *tleft = 0;
   if (!p->quality.OpenQflag)
@@ -1113,7 +1113,7 @@ int DLLEXPORT EN_stepQ(EN_ProjectHandle ph, long *tleft) {
 
 int DLLEXPORT EN_closeQ(EN_ProjectHandle ph) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   if (!p->Openflag)
     return (102);
@@ -1130,7 +1130,7 @@ int DLLEXPORT EN_closeQ(EN_ProjectHandle ph) {
 
 int DLLEXPORT EN_writeline(EN_ProjectHandle ph, char *line) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   if (!p->Openflag)
     return (102);
@@ -1141,7 +1141,7 @@ int DLLEXPORT EN_writeline(EN_ProjectHandle ph, char *line) {
 int DLLEXPORT EN_report(EN_ProjectHandle ph) {
   int errcode;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Check if results saved to binary output file */
   if (!p->save_options.SaveQflag)
@@ -1155,7 +1155,7 @@ int DLLEXPORT EN_report(EN_ProjectHandle ph) {
 int DLLEXPORT EN_resetreport(EN_ProjectHandle ph) {
   int i;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   if (!p->Openflag)
     return (102);
@@ -1170,7 +1170,7 @@ int DLLEXPORT EN_resetreport(EN_ProjectHandle ph) {
 int DLLEXPORT EN_setreport(EN_ProjectHandle ph, char *s) {
   char s1[MAXLINE + 1];
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   if (!p->Openflag)
     return (102);
@@ -1211,7 +1211,7 @@ int DLLEXPORT EN_getcontrol(EN_ProjectHandle ph, int cindex, int *ctype, int *li
                             EN_API_FLOAT_TYPE *level) {
   double s, lvl;
 
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   EN_Network *net = &pr->network;
 
@@ -1268,7 +1268,7 @@ int DLLEXPORT EN_getcontrol(EN_ProjectHandle ph, int cindex, int *ctype, int *li
 
 int DLLEXPORT EN_getcount(EN_ProjectHandle ph, EN_CountType code, int *count) {
 
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   EN_Network *net = &pr->network;
 
@@ -1306,7 +1306,7 @@ int DLLEXPORT EN_getcount(EN_ProjectHandle ph, EN_CountType code, int *count) {
 int DLLEXPORT EN_getoption(EN_ProjectHandle ph, EN_Option code,
                            EN_API_FLOAT_TYPE *value) {
 
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   hydraulics_t *hyd = &pr->hydraulics;
   quality_t *qu = &pr->quality;
@@ -1343,7 +1343,7 @@ int DLLEXPORT EN_getoption(EN_ProjectHandle ph, EN_Option code,
 int DLLEXPORT EN_gettimeparam(EN_ProjectHandle ph, int code, long *value) {
   int i;
 
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   report_options_t *rep = &pr->report;
   quality_t *qu = &pr->quality;
@@ -1408,7 +1408,7 @@ int DLLEXPORT EN_gettimeparam(EN_ProjectHandle ph, int code, long *value) {
 
 int DLLEXPORT EN_getflowunits(EN_ProjectHandle ph, int *code) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *code = -1;
   if (!p->Openflag)
@@ -1421,7 +1421,7 @@ int DLLEXPORT EN_setflowunits(EN_ProjectHandle ph, int code) {
   int i, j;
   double qfactor, vfactor, hfactor, efactor, xfactor, yfactor;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   double *Ucf = p->Ucf;
   EN_Network *net = &p->network;
@@ -1497,7 +1497,7 @@ int DLLEXPORT EN_setflowunits(EN_ProjectHandle ph, int code) {
 int DLLEXPORT EN_getpatternindex(EN_ProjectHandle ph, char *id, int *index) {
   int i;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *index = 0;
   if (!p->Openflag)
@@ -1514,7 +1514,7 @@ int DLLEXPORT EN_getpatternindex(EN_ProjectHandle ph, char *id, int *index) {
 
 int DLLEXPORT EN_getpatternid(EN_ProjectHandle ph, int index, char *id) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   strcpy(id, "");
   if (!p->Openflag)
@@ -1527,7 +1527,7 @@ int DLLEXPORT EN_getpatternid(EN_ProjectHandle ph, int index, char *id) {
 
 int DLLEXPORT EN_getpatternlen(EN_ProjectHandle ph, int index, int *len) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   if (!p->Openflag)
     return (102);
@@ -1540,7 +1540,7 @@ int DLLEXPORT EN_getpatternlen(EN_ProjectHandle ph, int index, int *len) {
 int DLLEXPORT EN_getpatternvalue(EN_ProjectHandle ph, int index, int period,
                                  EN_API_FLOAT_TYPE *value) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *value = 0.0;
   if (!p->Openflag)
@@ -1556,7 +1556,7 @@ int DLLEXPORT EN_getpatternvalue(EN_ProjectHandle ph, int index, int period,
 int DLLEXPORT EN_getcurveindex(EN_ProjectHandle ph, char *id, int *index) {
   int i;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *index = 0;
   if (!p->Openflag)
@@ -1573,7 +1573,7 @@ int DLLEXPORT EN_getcurveindex(EN_ProjectHandle ph, char *id, int *index) {
 
 int DLLEXPORT EN_getcurveid(EN_ProjectHandle ph, int index, char *id) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   strcpy(id, "");
   if (!p->Openflag)
@@ -1586,7 +1586,7 @@ int DLLEXPORT EN_getcurveid(EN_ProjectHandle ph, int index, char *id) {
 
 int DLLEXPORT EN_getcurvelen(EN_ProjectHandle ph, int index, int *len) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   if (!p->Openflag)
     return (102);
@@ -1599,7 +1599,7 @@ int DLLEXPORT EN_getcurvelen(EN_ProjectHandle ph, int index, int *len) {
 int DLLEXPORT EN_getcurvevalue(EN_ProjectHandle ph, int index, int pnt,
                                EN_API_FLOAT_TYPE *x, EN_API_FLOAT_TYPE *y) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *x = 0.0;
   *y = 0.0;
@@ -1616,7 +1616,7 @@ int DLLEXPORT EN_getcurvevalue(EN_ProjectHandle ph, int index, int pnt,
 
 int DLLEXPORT EN_getqualtype(EN_ProjectHandle ph, int *qualcode, int *tracenode) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *tracenode = 0;
   if (!p->Openflag)
@@ -1629,7 +1629,7 @@ int DLLEXPORT EN_getqualtype(EN_ProjectHandle ph, int *qualcode, int *tracenode)
 
 int DLLEXPORT EN_getqualinfo(EN_ProjectHandle ph, int *qualcode, char *chemname,
                                            char *chemunits, int *tracenode) {
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   ENgetqualtype(qualcode, tracenode);
   if (p->quality.Qualflag == TRACE) {
@@ -1676,7 +1676,7 @@ int DLLEXPORT EN_geterror(int errcode, char *errmsg, int n) {
 
 int DLLEXPORT EN_getstatistic(EN_ProjectHandle ph, int code, EN_API_FLOAT_TYPE *value) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   switch (code) {
   case EN_ITERATIONS:
@@ -1699,7 +1699,7 @@ int DLLEXPORT EN_getstatistic(EN_ProjectHandle ph, int code, EN_API_FLOAT_TYPE *
 
 int DLLEXPORT EN_getnodeindex(EN_ProjectHandle ph, char *id, int *index) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *index = 0;
   if (!p->Openflag)
@@ -1713,7 +1713,7 @@ int DLLEXPORT EN_getnodeindex(EN_ProjectHandle ph, char *id, int *index) {
 
 int DLLEXPORT EN_getnodeid(EN_ProjectHandle ph, int index, char *id) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   strcpy(id, "");
   if (!p->Openflag)
@@ -1726,7 +1726,7 @@ int DLLEXPORT EN_getnodeid(EN_ProjectHandle ph, int index, char *id) {
 
 int DLLEXPORT EN_getnodetype(EN_ProjectHandle ph, int index, int *code) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *code = -1;
   if (!p->Openflag)
@@ -1747,7 +1747,7 @@ int DLLEXPORT EN_getnodetype(EN_ProjectHandle ph, int index, int *code) {
 int DLLEXPORT EN_getcoord(EN_ProjectHandle ph, int index, EN_API_FLOAT_TYPE *x,
                           EN_API_FLOAT_TYPE *y) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   if (!p->Openflag)
     return (102);
@@ -1769,7 +1769,7 @@ int DLLEXPORT EN_getcoord(EN_ProjectHandle ph, int index, EN_API_FLOAT_TYPE *x,
 int DLLEXPORT EN_setcoord(EN_ProjectHandle ph, int index, EN_API_FLOAT_TYPE x,
                           EN_API_FLOAT_TYPE y) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   if (!p->Openflag)
     return (102);
@@ -1790,7 +1790,7 @@ int DLLEXPORT EN_getnodevalue(EN_ProjectHandle ph, int index, int code,
   Pdemand demand;
   Psource source;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
   
   EN_Network *net = &p->network;
   hydraulics_t *hyd = &p->hydraulics;
@@ -1989,7 +1989,7 @@ int DLLEXPORT EN_getnodevalue(EN_ProjectHandle ph, int index, int code,
 
 int DLLEXPORT EN_getlinkindex(EN_ProjectHandle ph, char *id, int *index) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *index = 0;
   if (!p->Openflag)
@@ -2003,7 +2003,7 @@ int DLLEXPORT EN_getlinkindex(EN_ProjectHandle ph, char *id, int *index) {
 
 int DLLEXPORT EN_getlinkid(EN_ProjectHandle ph, int index, char *id) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   strcpy(id, "");
   if (!p->Openflag)
@@ -2016,7 +2016,7 @@ int DLLEXPORT EN_getlinkid(EN_ProjectHandle ph, int index, char *id) {
 
 int DLLEXPORT EN_getlinktype(EN_ProjectHandle ph, int index, EN_LinkType *code) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *code = -1;
   if (!p->Openflag)
@@ -2030,7 +2030,7 @@ int DLLEXPORT EN_getlinktype(EN_ProjectHandle ph, int index, EN_LinkType *code)
 int DLLEXPORT EN_getlinknodes(EN_ProjectHandle ph, int index, int *node1,
                               int *node2) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   *node1 = 0;
   *node2 = 0;
@@ -2048,7 +2048,7 @@ int DLLEXPORT EN_getlinkvalue(EN_ProjectHandle ph, int index, EN_LinkProperty co
   double a, h, q, v = 0.0;
   int returnValue = 0;
   
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   hydraulics_t *hyd = &p->hydraulics;
@@ -2264,7 +2264,7 @@ int DLLEXPORT EN_getcurve(EN_ProjectHandle ph, int curveIndex, char *id, int *nV
   Scurve curve;
   EN_API_FLOAT_TYPE *pointX, *pointY;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Check that input file opened */
   if (!p->Openflag)
@@ -2314,7 +2314,7 @@ int DLLEXPORT EN_setcontrol(EN_ProjectHandle ph, int cindex, int ctype, int lind
   int Nlinks;
   double *Ucf;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Check that input file opened */
   if (!p->Openflag)
@@ -2423,7 +2423,7 @@ int DLLEXPORT EN_setnodevalue(EN_ProjectHandle ph, int index, int code, EN_API_F
  **----------------------------------------------------------------
  */
 {
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   hydraulics_t *hyd = &p->hydraulics;
@@ -2691,7 +2691,7 @@ int DLLEXPORT EN_setlinkvalue(EN_ProjectHandle ph, int index, int code,
  **----------------------------------------------------------------
  */
 {
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   hydraulics_t *hyd = &p->hydraulics;
@@ -2827,7 +2827,7 @@ int DLLEXPORT EN_addpattern(EN_ProjectHandle ph, char *id) {
   int i, j, n, err = 0;
   Spattern *tmpPat;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   parser_data_t *par = &p->parser;
@@ -2903,7 +2903,7 @@ int DLLEXPORT EN_addpattern(EN_ProjectHandle ph, char *id) {
 int DLLEXPORT EN_setpattern(EN_ProjectHandle ph, int index, EN_API_FLOAT_TYPE *f, int n) {
   int j;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   Spattern *Pattern = net->Pattern;
@@ -2932,7 +2932,7 @@ int DLLEXPORT EN_setpattern(EN_ProjectHandle ph, int index, EN_API_FLOAT_TYPE *f
 
 int DLLEXPORT EN_setpatternvalue(EN_ProjectHandle ph, int index, int period, EN_API_FLOAT_TYPE value) {
   
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   
@@ -2953,7 +2953,7 @@ int DLLEXPORT EN_setpatternvalue(EN_ProjectHandle ph, int index, int period, EN_
 
 int DLLEXPORT EN_addcurve(EN_ProjectHandle ph, char *id) {
   
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   parser_data_t *par = &p->parser;
@@ -3043,7 +3043,7 @@ int DLLEXPORT EN_addcurve(EN_ProjectHandle ph, char *id) {
 
 int DLLEXPORT EN_setcurve(EN_ProjectHandle ph, int index, EN_API_FLOAT_TYPE *x, EN_API_FLOAT_TYPE *y, int n) {
   
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;  
   Scurve *Curve = net->Curve;
@@ -3078,7 +3078,7 @@ int DLLEXPORT EN_setcurve(EN_ProjectHandle ph, int index, EN_API_FLOAT_TYPE *x,
 
 int DLLEXPORT EN_setcurvevalue(EN_ProjectHandle ph, int index, int pnt, EN_API_FLOAT_TYPE x, EN_API_FLOAT_TYPE y) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   
@@ -3100,7 +3100,7 @@ int DLLEXPORT EN_setcurvevalue(EN_ProjectHandle ph, int index, int pnt, EN_API_F
 
 int DLLEXPORT EN_settimeparam(EN_ProjectHandle ph, int code, long value)
 {
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   report_options_t *rep = &p->report;
   quality_t *qu = &p->quality;
@@ -3210,7 +3210,7 @@ int DLLEXPORT EN_setoption(EN_ProjectHandle ph, int code, EN_API_FLOAT_TYPE v)
  **----------------------------------------------------------------
  */
 {
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   hydraulics_t *hyd = &p->hydraulics;
@@ -3268,7 +3268,7 @@ int DLLEXPORT EN_setoption(EN_ProjectHandle ph, int code, EN_API_FLOAT_TYPE v)
 int DLLEXPORT EN_setstatusreport(EN_ProjectHandle ph, int code) {
   int errcode = 0;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   if (code >= 0 && code <= 2)
     p->report.Statflag = (char)code;
@@ -3279,7 +3279,7 @@ int DLLEXPORT EN_setstatusreport(EN_ProjectHandle ph, int code) {
 
 int DLLEXPORT EN_setqualtype(EN_ProjectHandle ph, int qualcode, char *chemname, char *chemunits, char *tracenode) {
   
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   report_options_t *rep = &p->report;
@@ -3346,7 +3346,7 @@ int DLLEXPORT EN_setqualtype(EN_ProjectHandle ph, int qualcode, char *chemname,
 
 int DLLEXPORT EN_getheadcurveindex(EN_ProjectHandle ph, int index, int *curveindex) {
   
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;  
   Slink *Link = net->Link;
@@ -3363,7 +3363,7 @@ int DLLEXPORT EN_getheadcurveindex(EN_ProjectHandle ph, int index, int *curveind
 
 int DLLEXPORT EN_setheadcurveindex(EN_ProjectHandle ph, int index, int curveindex) {
   
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   
@@ -3404,7 +3404,7 @@ int DLLEXPORT EN_setheadcurveindex(EN_ProjectHandle ph, int index, int curveinde
 
 int DLLEXPORT EN_getpumptype(EN_ProjectHandle ph, int index, int *type) {
   
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   
@@ -4179,7 +4179,7 @@ int DLLEXPORT EN_getnumdemands(EN_ProjectHandle ph, int nodeIndex, int *numDeman
   Pdemand d;
   int n = 0;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Check for valid arguments */
   if (!p->Openflag)
@@ -4196,7 +4196,7 @@ int DLLEXPORT EN_getbasedemand(EN_ProjectHandle ph, int nodeIndex, int demandIdx
   Pdemand d;
   int n = 1;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   /* Check for valid arguments */
   if (!p->Openflag)
@@ -4219,7 +4219,7 @@ int DLLEXPORT EN_getbasedemand(EN_ProjectHandle ph, int nodeIndex, int demandIdx
 
 int DLLEXPORT EN_setbasedemand(EN_ProjectHandle ph, int nodeIndex, int demandIdx, EN_API_FLOAT_TYPE baseDemand) {
   
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   EN_Network *net = &pr->network;
   Snode *Node = net->Node;
@@ -4248,7 +4248,7 @@ int DLLEXPORT EN_setbasedemand(EN_ProjectHandle ph, int nodeIndex, int demandIdx
 
 int DLLEXPORT EN_getdemandpattern(EN_ProjectHandle ph, int nodeIndex, int demandIdx, int *pattIdx) {
   
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   Snode *Node = net->Node;
@@ -4271,7 +4271,7 @@ int DLLEXPORT EN_getdemandpattern(EN_ProjectHandle ph, int nodeIndex, int demand
 
 int DLLEXPORT EN_getaveragepatternvalue(EN_ProjectHandle ph, int index, EN_API_FLOAT_TYPE *value) {
   
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   
@@ -4296,7 +4296,7 @@ int DLLEXPORT EN_setlinktype(EN_ProjectHandle ph, char *id, EN_LinkType toType)
   int i;
   EN_LinkType fromType;
   
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
 
@@ -4336,7 +4336,7 @@ int DLLEXPORT EN_addnode(EN_ProjectHandle ph, char *id, EN_NodeType nodeType) {
   int index;
   struct Sdemand *demand;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   hydraulics_t *hyd = &p->hydraulics;
@@ -4452,7 +4452,7 @@ int DLLEXPORT EN_addlink(EN_ProjectHandle ph, char *id, EN_LinkType linkType, ch
   int i, n;
   int N1, N2;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   hydraulics_t *hyd = &p->hydraulics;
@@ -4564,7 +4564,7 @@ int DLLEXPORT EN_deletelink(EN_ProjectHandle ph, int index) {
   int i;
   EN_LinkType linkType;
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   Slink *link;
@@ -4624,7 +4624,7 @@ int DLLEXPORT EN_deletelink(EN_ProjectHandle ph, int index) {
 
 int DLLEXPORT EN_deletenode(EN_ProjectHandle ph, int index) {
 
-  EN_Project* p = (EN_Project*)ph;
+  EN_Project *p = (EN_Project*)ph;
 
   EN_Network *net = &p->network;
   
@@ -4708,7 +4708,7 @@ int DLLEXPORT EN_getrule(EN_ProjectHandle ph, int index, int *nPremises, int *nT
   Premise *p;
   Action *c;
   
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   EN_Network *net = &pr->network;
 
@@ -4750,7 +4750,7 @@ int DLLEXPORT EN_getpremise(EN_ProjectHandle ph, int indexRule, int idxPremise,
   EN_API_FLOAT_TYPE priority;
   Premise *p;
   
-  EN_Project* pr;
+  EN_Project *pr;
   pr = (EN_Project*)ph;
   
   if (indexRule > pr->network.Nrules) {
@@ -4785,7 +4785,7 @@ int DLLEXPORT EN_setrulepriority(EN_ProjectHandle ph, int index, EN_API_FLOAT_TY
 **----------------------------------------------------------------
 */
 {
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   if (index > pr->network.Nrules) {
     return (257);
@@ -4802,7 +4802,7 @@ int DLLEXPORT EN_setpremise(EN_ProjectHandle ph, int indexRule, int indexPremise
   EN_API_FLOAT_TYPE priority;
   Premise *p;
   
-  EN_Project* pr;
+  EN_Project *pr;
   pr = (EN_Project*)ph;
 
   if (indexRule > pr->network.Nrules) {
@@ -4832,7 +4832,7 @@ int DLLEXPORT EN_setpremiseindex(EN_ProjectHandle ph, int indexRule, int indexPr
   EN_API_FLOAT_TYPE priority;
   Premise *p;
 
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   if (indexRule > pr->network.Nrules)
     return (257);
@@ -4854,7 +4854,7 @@ int DLLEXPORT EN_setpremisestatus(EN_ProjectHandle ph, int indexRule, int indexP
   EN_API_FLOAT_TYPE priority;
   Premise *p;
 
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   if (indexRule > pr->network.Nrules) {
     return (257);
@@ -4878,7 +4878,7 @@ int DLLEXPORT EN_setpremisevalue(EN_ProjectHandle ph, int indexRule, int indexPr
   EN_API_FLOAT_TYPE priority;
   Premise *p;
 
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   if (indexRule > pr->network.Nrules)
     return (257);
@@ -4901,7 +4901,7 @@ int DLLEXPORT EN_gettrueaction(EN_ProjectHandle ph, int indexRule, int indexActi
   EN_API_FLOAT_TYPE priority;
   Action *a;
 
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   if (indexRule > pr->network.Nrules) {
     return (252);
@@ -4927,7 +4927,7 @@ int DLLEXPORT EN_settrueaction(EN_ProjectHandle ph, int indexRule, int indexActi
   EN_API_FLOAT_TYPE priority;
   Action *a;
 
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   if (indexRule > pr->network.Nrules) {
     return (257);
@@ -4953,7 +4953,7 @@ int DLLEXPORT EN_getfalseaction(EN_ProjectHandle ph, int indexRule, int indexAct
   EN_API_FLOAT_TYPE priority;
   Action *a;
 
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   if (indexRule > pr->network.Nrules) {
     return (257);
@@ -4979,7 +4979,7 @@ int DLLEXPORT EN_setfalseaction(EN_ProjectHandle ph, int indexRule, int indexAct
   EN_API_FLOAT_TYPE priority;
   Action *a;
 
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   if (indexRule > pr->network.Nrules) {
     return (257);
@@ -5002,7 +5002,7 @@ int DLLEXPORT EN_setfalseaction(EN_ProjectHandle ph, int indexRule, int indexAct
 
 int DLLEXPORT EN_getruleID(EN_ProjectHandle ph, int indexRule, char *id) {
 
-  EN_Project* pr = (EN_Project*)ph;
+  EN_Project *pr = (EN_Project*)ph;
 
   strcpy(id, "");
   if (!pr->Openflag)
diff --git a/src/vars.h b/src/vars.h
index 88a940a..9c4c08f 100755
--- a/src/vars.h
+++ b/src/vars.h
@@ -11,6 +11,6 @@
 
 // this single global variable is used only when the library is called in "legacy mode"
 // with the 2.1-style API. 
-EXTERN void* _defaultModel;
+EXTERN void *_defaultModel;
 
 #endif