Mercurial > hg > dmlib

diff tools/objlink.c @ 2004:161e731eb152

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve dmGetIntVal() to accept an optional negative value boolean flag pointer. Also improve error handling in it.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 07 Jul 2018 01:11:22 +0300
parents bd68c9adc7ca
children bec158e00f17
line wrap: on
line diff
--- a/tools/objlink.c	Tue Jul 03 09:54:14 2018 +0300
+++ b/tools/objlink.c	Sat Jul 07 01:11:22 2018 +0300
@@ -259,7 +259,7 @@
     *sep = 0;
 
     // Get value
-    if (!dmGetIntVal(str, sectStart))
+    if (!dmGetIntVal(str, sectStart, NULL))
     {
         dmErrorMsg("Section start address '%s' in '%s' invalid.\n", str, arg);
         goto out;
@@ -288,7 +288,7 @@
     }
 
     // Get end address or length
-    if (!dmGetIntVal(sep + 1, &tmpi))
+    if (!dmGetIntVal(sep + 1, &tmpi, NULL))
     {
         dmErrorMsg("Section %s '%s' in '%s' invalid.\n",
             sectMode == '-' ? "end address" : "length",
@@ -328,7 +328,7 @@
     if ((sep = strrchr(arg, ':')) != NULL)
     {
         *sep = 0;
-        if (!dmGetIntVal(sep + 1, &tmpi))
+        if (!dmGetIntVal(sep + 1, &tmpi, NULL))
         {
             dmErrorMsg("Invalid %s address '%s' specified for '%s'.\n",
                 desc, sep + 1, arg);
@@ -438,7 +438,7 @@
                     return FALSE;
             }
         }
-        if (!dmGetIntVal(optArg, &tmpi))
+        if (!dmGetIntVal(optArg, &tmpi, NULL))
         {
             dmErrorMsg("Invalid initvalue '%s'.\n", optArg);
             return FALSE;
@@ -488,7 +488,7 @@
             optLoadAddress = LA_NONE;
         else
         {
-            if (!dmGetIntVal(optArg, &tmpi))
+            if (!dmGetIntVal(optArg, &tmpi, NULL))
             {
                 dmErrorMsg("Invalid loading address '%s'.\n", optArg);
                 return FALSE;