From 12c64b69cdc2254202c683babcca06d9851a1d53 Mon Sep 17 00:00:00 2001
From: Lew Rossman <LRossman@cinci.rr.com>
Date: Wed, 6 Mar 2019 13:23:55 -0500
Subject: [PATCH] Refactored EN_close function to use newly added closeoutfile
 function

---
 src/epanet.c  | 20 ++++----------------
 src/quality.c |  9 +--------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/epanet.c b/src/epanet.c
index e39c752..71c2b26 100644
--- a/src/epanet.c
+++ b/src/epanet.c
@@ -332,24 +332,12 @@ int DLLEXPORT EN_close(EN_Project p)
  **----------------------------------------------------------------
  */
 {
-    Outfile *out;
-
     // Free all project data
     if (p->Openflag) writetime(p, FMT105);
     freedata(p);
 
     // Close output file
-    out = &p->outfile;
-    if (out->TmpOutFile != out->OutFile)
-    {
-        if (out->TmpOutFile != NULL) fclose(out->TmpOutFile);
-        out->TmpOutFile = NULL;
-    }
-    if (out->OutFile != NULL)
-    {
-        fclose(out->OutFile);
-        out->OutFile = NULL;
-    }
+    closeoutfile(p);
 
     // Close input file
     if (p->parser.InFile != NULL)
@@ -366,10 +354,10 @@ int DLLEXPORT EN_close(EN_Project p)
     }
 
     // Close hydraulics file
-    if (out->HydFile != NULL)
+    if (p->outfile.HydFile != NULL)
     {
-        fclose(out->HydFile);
-        out->HydFile = NULL;
+        fclose(p->outfile.HydFile);
+        p->outfile.HydFile = NULL;
     }
 
     // Reset system flags
diff --git a/src/quality.c b/src/quality.c
index e46fe42..de27f63 100644
--- a/src/quality.c
+++ b/src/quality.c
@@ -27,14 +27,7 @@ Last Updated: 11/27/2018
 // Stagnant flow tolerance
 const double Q_STAGNANT = 0.005 / GPMperCFS;     // 0.005 gpm = 1.114e-5 cfs
 
-// Exported functions (declared in FUNCS.H)
-//int     openqual(Project *);
-//void    initqual(Project *);
-//int     runqual(Project *, long *);
-//int     nextqual(Project *, long *);
-//int     stepqual(Project *, long *);
-//int     closequal(Project *);
-//double  avgqual(Project *, int);
+// Exported functions
 double  findsourcequal(Project *, int, double, long);
 
 // Imported functions