--- a/tools/objlink.c	Fri Feb 27 02:21:57 2015 +0200
+++ b/tools/objlink.c	Fri Feb 27 03:58:25 2015 +0200
@@ -207,7 +207,7 @@
 {
     if (startAddr > endAddr)
     {
-        dmError("ERROR! Block '%s' has startAddr=$%.4x > endAddr=$%.4x!\n",
+        dmErrorMsg("ERROR! Block '%s' has startAddr=$%.4x > endAddr=$%.4x!\n",
             blockName, startAddr, endAddr);
         exit(4);
     }
@@ -222,7 +222,7 @@
     }
     else
     {
-        dmError("Maximum number of memBlock definitions (%d) exceeded!\n",
+        dmErrorMsg("Maximum number of memBlock definitions (%d) exceeded!\n",
             MAX_FILENAMES);
         exit(4);
     }
@@ -245,7 +245,7 @@
     // Create a copy of the argument
     if ((str = dm_strdup(arg)) == NULL)
     {
-        dmError("Could not allocate temporary string!\n");
+        dmErrorMsg("Could not allocate temporary string!\n");
         exit(128);
     }
 
@@ -253,7 +253,7 @@
     if ((sep = strchr(str, '-')) == NULL &&
         (sep = strchr(str, ':')) == NULL)
     {
-        dmError("Section definition '%s' invalid.\n", arg);
+        dmErrorMsg("Section definition '%s' invalid.\n", arg);
         goto error;
     }
     sectMode = *sep;
@@ -262,7 +262,7 @@
     // Get value
     if (!dmGetIntVal(str, sectStart))
     {
-        dmError("Section start address '%s' in '%s' invalid.\n", str, arg);
+        dmErrorMsg("Section start address '%s' in '%s' invalid.\n", str, arg);
         goto error;
     }
     
@@ -274,7 +274,7 @@
         namesep++;
         if (*namesep == 0)
         {
-            dmError("Section definition '%s' name is empty. Either specify name or leave it out.\n",
+            dmErrorMsg("Section definition '%s' name is empty. Either specify name or leave it out.\n",
                 arg);
             goto error;
         }
@@ -283,7 +283,7 @@
     else
     if (namesep != NULL)
     {
-        dmError("Section definition does not allow a name, syntax error in '%s' at '%s'.\n",
+        dmErrorMsg("Section definition does not allow a name, syntax error in '%s' at '%s'.\n",
             arg, namesep);
         goto error;
     }
@@ -291,7 +291,7 @@
     // Get end address or length
     if (!dmGetIntVal(sep + 1, &tmpi))
     {
-        dmError("Section %s '%s' in '%s' invalid.\n",
+        dmErrorMsg("Section %s '%s' in '%s' invalid.\n",
             sectMode == '-' ? "end address" : "length",
             sep + 1, arg);
         goto error;
@@ -305,7 +305,7 @@
     {
         if (tmpi < *sectStart)
         {
-            dmError("Section start address > end address in '%s'.\n",
+            dmErrorMsg("Section start address > end address in '%s'.\n",
                 arg);
             goto error;
         }
@@ -332,7 +332,7 @@
         *sep = 0;
         if (!dmGetIntVal(sep + 1, &tmpi))
         {
-            dmError("Invalid %s address '%s' specified for '%s'.\n",
+            dmErrorMsg("Invalid %s address '%s' specified for '%s'.\n",
                 desc, sep + 1, arg);
             return FALSE;
         }
@@ -341,7 +341,7 @@
     else
     if (requireAddr)
     {
-        dmError("No %s loading address specified for '%s'.\n", desc, arg);
+        dmErrorMsg("No %s loading address specified for '%s'.\n", desc, arg);
         return FALSE;
     }
 
@@ -384,7 +384,7 @@
     case 6:
         // Allow overlapping segments
         optAllowOverlap = TRUE;
-        dmError("Warning, allowing overlapping data.\n");
+        dmErrorMsg("Warning, allowing overlapping data.\n");
         break;
 
     case 7:
@@ -392,7 +392,7 @@
         optMemModel = atoi(optArg);
         if (optMemModel < 0 || optMemModel >= nmemoryModels)
         {
-            dmError("Invalid memory model number %i!\n", optMemModel);
+            dmErrorMsg("Invalid memory model number %i!\n", optMemModel);
             return FALSE;
         }
         break;
@@ -417,7 +417,7 @@
                 break;
 
             default:
-                dmError("Invalid/unknown linker file format '%s'!\n",
+                dmErrorMsg("Invalid/unknown linker file format '%s'!\n",
                     optArg);
                 return FALSE;
         }
@@ -435,14 +435,14 @@
                 case 'w': optInitValueType = 2; break;
                 case 'd': optInitValueType = 4; break;
                 default:
-                    dmError("Invalid init value type '%c' specified for '%s'.\n",
+                    dmErrorMsg("Invalid init value type '%c' specified for '%s'.\n",
                         p[1], optArg);
                     return FALSE; 
             }
         }
         if (!dmGetIntVal(optArg, &tmpi))
         {
-            dmError("Invalid initvalue '%s'.\n", optArg);
+            dmErrorMsg("Invalid initvalue '%s'.\n", optArg);
             return FALSE;
         }
         optInitValue = tmpi;
@@ -491,12 +491,12 @@
         {
             if (!dmGetIntVal(optArg, &tmpi))
             {
-                dmError("Invalid loading address '%s'.\n", optArg);
+                dmErrorMsg("Invalid loading address '%s'.\n", optArg);
                 return FALSE;
             }
             if (tmpi >= 64*1024)
             {
-                dmError("Invalid or insane loading address %d/$%x!\n",
+                dmErrorMsg("Invalid or insane loading address %d/$%x!\n",
                     tmpi);
                 return FALSE;
             }
@@ -505,7 +505,7 @@
         break;
 
     default:
-        dmError("Unknown argument '%s'.\n", currArg);
+        dmErrorMsg("Unknown argument '%s'.\n", currArg);
         return FALSE;
     }
 
@@ -522,7 +522,7 @@
     // Open the input file
     if ((f = fopen(filename, "rb")) == NULL)
     {
-        dmError("Error opening input file '%s' (%s).\n",
+        dmErrorMsg("Error opening input file '%s' (%s).\n",
             filename, strerror(errno));
         return 1;
     }
@@ -530,14 +530,14 @@
     // Get filesize
     if ((dataSize = dmGetFileSize(f) - 2) < 0)
     {
-        dmError("Error getting file size for '%s'.\n", filename);
+        dmErrorMsg("Error getting file size for '%s'.\n", filename);
         return 6;
     }
 
     // Get loading address
     if (!dm_fread_le16(f, &tmpAddr))
     {
-        dmError("Error reading input file '%s' (%s).\n",
+        dmErrorMsg("Error reading input file '%s' (%s).\n",
             filename, strerror(errno));
         return 2;
     }
@@ -580,7 +580,7 @@
     // Open the input file
     if ((f = fopen(filename, "rb")) == NULL)
     {
-        dmError("Error opening input file '%s' (%s).\n",
+        dmErrorMsg("Error opening input file '%s' (%s).\n",
             filename, strerror(errno));
         return 1;
     }
@@ -588,7 +588,7 @@
     // Get filesize
     if ((dataSize = dmGetFileSize(f)) < 0)
     {
-        dmError("Error getting file size for '%s'.\n", filename);
+        dmErrorMsg("Error getting file size for '%s'.\n", filename);
         return 6;
     }
 
@@ -631,7 +631,7 @@
     tmpStr = dm_strdup(blockName);
     if (tmpStr == NULL)
     {
-        dmError("Could not allocate memory for string '%s'!\n",
+        dmErrorMsg("Could not allocate memory for string '%s'!\n",
             blockName);
         return -1;
     }
@@ -775,7 +775,7 @@
 
     if (nsrcFiles < 1)
     {
-        dmError("Nothing to do. (try --help)\n");
+        dmErrorMsg("Nothing to do. (try --help)\n");
         exit(0);
     }
 
@@ -787,7 +787,7 @@
     memory = (Uint8 *) dmMalloc(memModel->size + 32);
     if (memory == NULL)
     {
-        dmError("Could not allocate memory.\n");
+        dmErrorMsg("Could not allocate memory.\n");
         exit(2);
     }
 
@@ -872,7 +872,7 @@
 
     if (!optAllowOverlap && hasOverlaps)
     {
-        dmError("Error occured, overlaps not allowed.\n");
+        dmErrorMsg("Error occured, overlaps not allowed.\n");
         exit(5);
     }
 
@@ -896,7 +896,7 @@
 
     if (startAddr >= memModel->size || endAddr < startAddr)
     {
-        dmError("Invalid saveblock addresses (start=$%.4x, end=$%.4x)!\n", startAddr, endAddr);
+        dmErrorMsg("Invalid saveblock addresses (start=$%.4x, end=$%.4x)!\n", startAddr, endAddr);
         exit(8);
     }
 
@@ -906,7 +906,7 @@
         dmMsg(1, "Writing linkfile to '%s'\n", optLinkFileName);
         if ((dfile = fopen(optLinkFileName, "wb")) == NULL)
         {
-            dmError("Error creating file '%s' (%s).\n", optLinkFileName, strerror(errno));
+            dmErrorMsg("Error creating file '%s' (%s).\n", optLinkFileName, strerror(errno));
             exit(1);
         }
 
@@ -955,7 +955,7 @@
     }
     else if ((dfile = fopen(optDestName, "wb")) == NULL)
     {
-        dmError("Error creating output file '%s' (%s).\n", optDestName, strerror(errno));
+        dmErrorMsg("Error creating output file '%s' (%s).\n", optDestName, strerror(errno));
         exit(1);
     }
     else
@@ -981,7 +981,7 @@
     // Save the data
     if (fwrite(&memory[startAddr], dataSize, 1, dfile) < 1)
     {
-        dmError("Error writing to file (%s)\n", strerror(errno));
+        dmErrorMsg("Error writing to file (%s)\n", strerror(errno));
     }
 
     fclose(dfile);