Mercurial > hg > dmlib

changeset 1674:0f256e7340a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename varibles.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 31 May 2018 13:03:53 +0300
parents a2b45dddfe79
children bc5a75888fa9
files tools/objlink.c
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/tools/objlink.c	Thu May 31 12:52:20 2018 +0300
+++ b/tools/objlink.c	Thu May 31 13:03:53 2018 +0300
@@ -514,12 +514,12 @@
 
 int dmLoadPRG(const char *filename, BOOL forceAddr, const int destAddr)
 {
-    FILE *f;
     int dataSize, loadAddr, endAddr;
+    FILE *fh;
     Uint16 tmpAddr;
 
     // Open the input file
-    if ((f = fopen(filename, "rb")) == NULL)
+    if ((fh = fopen(filename, "rb")) == NULL)
     {
         int err = dmGetErrno();
         dmErrorMsg("Error opening input file '%s' #%d: %s.\n",
@@ -528,7 +528,7 @@
     }
 
     // Get filesize
-    if ((dataSize = dmGetFileSize(f) - 2) < 0)
+    if ((dataSize = dmGetFileSize(fh) - 2) < 0)
     {
         int err = dmGetErrno();
         dmErrorMsg("Error getting file size for '%s' #%d: %s.\n",
@@ -537,7 +537,7 @@
     }
 
     // Get loading address
-    if (!dm_fread_le16(f, &tmpAddr))
+    if (!dm_fread_le16(fh, &tmpAddr))
     {
         int err = dmGetErrno();
         dmErrorMsg("Error reading input file '%s' #%d: %s.\n",
@@ -559,7 +559,7 @@
     }
 
     // Load data
-    if (fread(&memory[loadAddr], dataSize, 1, f) < 1)
+    if (fread(&memory[loadAddr], dataSize, 1, fh) < 1)
     {
         int err = dmGetErrno();
         dmPrint(1, " .. Error #%d: %s.\n",
@@ -578,11 +578,11 @@
 
 int dmLoadRAW(const char *filename, const int destAddr)
 {
-    FILE *f;
     int dataSize, endAddr;
+    FILE *fh;
 
     // Open the input file
-    if ((f = fopen(filename, "rb")) == NULL)
+    if ((fh = fopen(filename, "rb")) == NULL)
     {
         int err = dmGetErrno();
         dmErrorMsg("Error opening input file '%s' #%d: %s.\n",
@@ -591,7 +591,7 @@
     }
 
     // Get filesize
-    if ((dataSize = dmGetFileSize(f)) < 0)
+    if ((dataSize = dmGetFileSize(fh)) < 0)
     {
         dmErrorMsg("Error getting file size for '%s'.\n", filename);
         return 6;
@@ -609,7 +609,7 @@
     }
 
     // Load data
-    if (fread(&memory[destAddr], dataSize, 1, f) < 1)
+    if (fread(&memory[destAddr], dataSize, 1, fh) < 1)
     {
         int err = dmGetErrno();
         dmPrint(1, " .. Error #%d: %s.\n",