diff tools/objlink.c @ 2565:d56a0e86067a

Improve error handling.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 28 Feb 2022 11:49:58 +0200
parents 2cf4e995b50c
children 9807ae37ad69
line wrap: on
line diff
--- a/tools/objlink.c	Mon Feb 28 10:18:38 2022 +0200
+++ b/tools/objlink.c	Mon Feb 28 11:49:58 2022 +0200
@@ -576,8 +576,8 @@
     if ((fh = fopen(filename, "rb")) == NULL)
     {
         res = dmGetErrno();
-        dmErrorMsg("Error opening input file '%s' #%d: %s.\n",
-            filename, res, dmErrorStr(res));
+        dmErrorMsg("Error opening input file '%s': %s.\n",
+            filename, dmErrorStr(res));
         goto out;
     }
 
@@ -585,8 +585,8 @@
     if ((dataSize = dmGetFileSize(fh) - 2) < 0)
     {
         res = dmGetErrno();
-        dmErrorMsg("Error getting file size for '%s' #%d: %s.\n",
-            filename, res, dmErrorStr(res));
+        dmErrorMsg("Error getting file size for '%s': %s.\n",
+            filename, dmErrorStr(res));
         goto out;
     }
 
@@ -594,8 +594,8 @@
     if (!dm_fread_le16(fh, &tmpAddr))
     {
         res = dmGetErrno();
-        dmErrorMsg("Error reading input file '%s' #%d: %s.\n",
-            filename, res, dmErrorStr(res));
+        dmErrorMsg("Error reading input file '%s': %s.\n",
+            filename, dmErrorStr(res));
         goto out;
     }
 
@@ -617,8 +617,8 @@
     if (fread(&memory[loadAddr], dataSize, 1, fh) < 1)
     {
         res = dmGetErrno();
-        dmPrint(1, " .. Error #%d: %s.\n",
-            res, dmErrorStr(res));
+        dmPrint(1, " .. Error: %s.\n",
+            dmErrorStr(res));
         goto out;
     }
 
@@ -645,8 +645,8 @@
     if ((fh = fopen(filename, "rb")) == NULL)
     {
         res = dmGetErrno();
-        dmErrorMsg("Error opening input file '%s' #%d: %s.\n",
-            filename, res, dmErrorStr(res));
+        dmErrorMsg("Error opening input file '%s': %s.\n",
+            filename, dmErrorStr(res));
         goto out;
     }
 
@@ -674,8 +674,8 @@
     if (fread(&memory[destAddr], dataSize, 1, fh) < 1)
     {
         res = dmGetErrno();
-        dmPrint(1, " .. Error reading data #%d: %s.\n",
-            res, dmErrorStr(res));
+        dmPrint(1, " .. Error reading data: %s.\n",
+            dmErrorStr(res));
         goto out;
     }
 
@@ -855,7 +855,9 @@
 
     if (nsrcFiles < 1)
     {
-        dmErrorMsg("Nothing to do. (try --help)\n");
+        argShowHelp();
+        res = dmError(DMERR_INVALID_ARGS,
+            "No input file(s) specified.\n");
         goto out;
     }