# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1525993177 -10800
# Node ID c543f5ae92d5a5dacbb45a1a4d3b1d3c6f01f885
# Parent  b9d3577d82902bab7255bf72f42361256dcf05bf
Cleanup dmReadDataFile() helper function.

diff -r b9d3577d8290 -r c543f5ae92d5 src/dmfile.c
--- a/src/dmfile.c	Thu May 10 23:08:09 2018 +0300
+++ b/src/dmfile.c	Fri May 11 01:59:37 2018 +0300
@@ -61,25 +61,26 @@
 #define BUF_SIZE_INITIAL   (16*1024)
 #define BUF_SIZE_GROW      (4*1024)
 
-int dmReadDataFile(FILE *inFile, const char *filename, Uint8 **pbuf, size_t *pbufSize)
+int dmReadDataFile(FILE *ffh, const char *filename, Uint8 **pbuf, size_t *pbufSize)
 {
-    FILE *f;
+    FILE *fh = NULL;
     int res = DMERR_OK;
     Uint8 *dataBuf = NULL;
     size_t readSize, dataSize, dataRead, dataPos;
 
-    if (inFile != NULL)
-        f = inFile;
+    if (ffh != NULL)
+        fh = ffh;
     else
     if (filename != NULL)
     {
-        if ((f = fopen(filename, "rb")) == NULL)
+        if ((fh = fopen(filename, "rb")) == NULL)
         {
             return dmError(DMERR_FOPEN,
                 "Could not open '%s' for reading.\n", filename);
         }
     }
-    else
+
+    if (fh == NULL)
     {
         return dmError(DMERR_NULLPTR,
             "NULL filename and stream pointers.\n");
@@ -94,12 +95,11 @@
         goto error;
     }
 
-    dataPos = 0;
-    dataRead = 0;
-
-    while (!feof(f) && !ferror(f))
+    // Read the data
+    dataPos = dataRead = 0;
+    while (!feof(fh) && !ferror(fh))
     {
-        size_t read = fread(dataBuf + dataPos, 1, readSize, f);
+        size_t read = fread(dataBuf + dataPos, 1, readSize, fh);
         dataPos += read;
         dataRead += read;
 
@@ -123,8 +123,8 @@
     *pbuf = dataBuf;
 
 error:
-    if (f != inFile)
-        fclose(f);
+    if (ffh != fh)
+        fclose(fh);
 
     return res;
 }
diff -r b9d3577d8290 -r c543f5ae92d5 src/dmfile.h
--- a/src/dmfile.h	Thu May 10 23:08:09 2018 +0300
+++ b/src/dmfile.h	Fri May 11 01:59:37 2018 +0300
@@ -31,7 +31,7 @@
 BOOL    dm_fwrite_byte(FILE *f, const Uint8);
 
 
-int     dmReadDataFile(FILE *inFile, const char *filename, Uint8 **buf, size_t *size);
+int     dmReadDataFile(FILE *inFile, const char *filename, Uint8 **pbuf, size_t *pbufSize);
 
 
 #ifdef __cplusplus