# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1588232095 -10800
# Node ID 14ed647420106270f222c35512a3bcdec931132c
# Parent  6f2572b6f151f5cfbf917e40dca6e33e26976b95
Cleanup.

diff -r 6f2572b6f151 -r 14ed64742010 tools/objlink.c
--- a/tools/objlink.c	Thu Apr 30 08:51:21 2020 +0300
+++ b/tools/objlink.c	Thu Apr 30 10:34:55 2020 +0300
@@ -371,8 +371,6 @@
 
 BOOL argHandleOpt(const int optN, char *optArg, char *currArg)
 {
-    char *p;
-    unsigned int tmpi;
 
     switch (optN)
     {
@@ -467,27 +465,32 @@
 
         case 26:
             // Initialization value
-            optInitValueType = 1;
-            if ((p = strrchr(optArg, ':')) != NULL)
             {
-                *p = 0;
-                switch (tolower(p[1]))
+                char *p;
+                unsigned int tmpi;
+
+                optInitValueType = 1;
+                if ((p = strrchr(optArg, ':')) != NULL)
                 {
-                    case 'b': optInitValueType = 1; break;
-                    case 'w': optInitValueType = 2; break;
-                    case 'd': optInitValueType = 4; break;
-                    default:
-                        dmErrorMsg("Invalid init value type '%c' specified for '%s'.\n",
-                            p[1], optArg);
-                        return FALSE;
+                    *p = 0;
+                    switch (tolower(p[1]))
+                    {
+                        case 'b': optInitValueType = 1; break;
+                        case 'w': optInitValueType = 2; break;
+                        case 'd': optInitValueType = 4; break;
+                        default:
+                            dmErrorMsg("Invalid init value type '%c' specified for '%s'.\n",
+                                p[1], optArg);
+                            return FALSE;
+                    }
                 }
+                if (!dmGetIntVal(optArg, &tmpi, NULL))
+                {
+                    dmErrorMsg("Invalid initvalue '%s'.\n", optArg);
+                    return FALSE;
+                }
+                optInitValue = tmpi;
             }
-            if (!dmGetIntVal(optArg, &tmpi, NULL))
-            {
-                dmErrorMsg("Invalid initvalue '%s'.\n", optArg);
-                return FALSE;
-            }
-            optInitValue = tmpi;
             break;
 
         case 28:
@@ -519,6 +522,8 @@
             }
             else
             {
+                unsigned int tmpi;
+
                 if (!dmGetIntVal(optArg, &tmpi, NULL))
                 {
                     dmErrorMsg("Invalid loading address '%s'.\n", optArg);