--- a/tools/xm2jss.c	Fri Feb 27 02:21:57 2015 +0200
+++ b/tools/xm2jss.c	Fri Feb 27 03:58:25 2015 +0200
@@ -108,7 +108,7 @@
         optPatternMode = atoi(optArg);
         if (optPatternMode <= 0 || optPatternMode >= PATMODE_LAST)
         {
-            dmError("Unknown pattern conversion mode %d\n", optPatternMode);
+            dmErrorMsg("Unknown pattern conversion mode %d\n", optPatternMode);
             return FALSE;
         }
         break;
@@ -123,7 +123,7 @@
     case 9: optOptimize = TRUE; break;
 
     default:
-        dmError("Unknown argument '%s'.\n", currArg);
+        dmErrorMsg("Unknown argument '%s'.\n", currArg);
         return FALSE;
     }
     
@@ -141,7 +141,7 @@
         optOutFilename = currArg;
     else
     {
-        dmError("Too many filename arguments specified, '%s'.\n", currArg);
+        dmErrorMsg("Too many filename arguments specified, '%s'.\n", currArg);
         return FALSE;
     }
     
@@ -716,7 +716,7 @@
             }
             else
             {
-                dmError("Pattern 0x%x is used on order 0x%x, but has no data!\n",
+                dmErrorMsg("Pattern 0x%x is used on order 0x%x, but has no data!\n",
                 pattern, i);
 
                 // Fix it.
@@ -726,7 +726,7 @@
         else
         if (pattern != jsetMaxPatterns)
         {
-            dmError("Order 0x%x has invalid pattern number 0x%x!\n",
+            dmErrorMsg("Order 0x%x has invalid pattern number 0x%x!\n",
             i, pattern);
             
             // Fix it.
@@ -751,7 +751,7 @@
             }
             else
             {
-                dmError("Ext.instrument #%d sNumForNotes[%d] value out range (%d < %d).\n",
+                dmErrorMsg("Ext.instrument #%d sNumForNotes[%d] value out range (%d < %d).\n",
                 i, m->ninstruments, q);
             }
         }
@@ -771,7 +771,7 @@
         else
         {
             if (i >= m->npatterns)
-                dmError("Pattern 0x%x >= 0x%x, but used!\n", i, m->npatterns);
+                dmErrorMsg("Pattern 0x%x >= 0x%x, but used!\n", i, m->npatterns);
             
             mapPatterns[i] = r->npatterns;
             r->patterns[r->npatterns] = m->patterns[i];
@@ -797,7 +797,7 @@
         {
             JSSInstrument *ip = m->instruments[i];
             if (i >= m->ninstruments)
-                dmError("Instrument 0x%x >= 0x%x, but used!\n", i, m->ninstruments);
+                dmErrorMsg("Instrument 0x%x >= 0x%x, but used!\n", i, m->ninstruments);
             
             mapInstruments[i] = r->ninstruments;
             r->instruments[r->ninstruments] = ip;
@@ -820,7 +820,7 @@
     {
         if (i >= m->nextInstruments && !optStripExtInstr)
         {
-            dmError("Ext.instrument 0x%x >= 0x%x, but used!\n",
+            dmErrorMsg("Ext.instrument 0x%x >= 0x%x, but used!\n",
             i, m->nextInstruments);
         }
         else
@@ -847,7 +847,7 @@
                     else
                     {
                         map = jsetNotSet;
-                        dmError("e=%d, note=%d, q=%d/%d\n", i, note, q, r->ninstruments);
+                        dmErrorMsg("e=%d, note=%d, q=%d/%d\n", i, note, q, r->ninstruments);
                     }
                     e->sNumForNotes[note] = map;
                 }
@@ -888,7 +888,7 @@
                     n->instrument = mapExtInstruments[n->instrument];
 
                 if (n->instrument != jsetNotSet && r->extInstruments[n->instrument] == NULL)
-                    dmError("Non-existing instrument used #%d.\n", n->instrument);
+                    dmErrorMsg("Non-existing instrument used #%d.\n", n->instrument);
             }
 
             JMPGETEFFECT(effect, n->effect);
@@ -935,14 +935,14 @@
     // Check arguments
     if (optInFilename == NULL || optOutFilename == NULL)
     {
-        dmError("Input or output file not specified. Try --help.\n");
+        dmErrorMsg("Input or output file not specified. Try --help.\n");
         return 1;
     }
 
     // Read the source file
     if ((result = dmf_create_stdio(optInFilename, "rb", &inFile)) != DMERR_OK)
     {
-        dmError("Error opening input file '%s', %d: %s\n",
+        dmErrorMsg("Error opening input file '%s', %d: %s\n",
             optInFilename, result, dmErrorStr(result));
         return 1;
     }
@@ -956,7 +956,7 @@
     dmf_close(inFile);
     if (result != 0)
     {
-        dmError("Error while loading XM file (%i), ", result);
+        dmErrorMsg("Error while loading XM file (%i), ", result);
         if (optIgnoreErrors)
             fprintf(stderr, "ignoring. This may cause problems.\n");
         else
@@ -1021,7 +1021,7 @@
     // Write output file
     if ((outFile = fopen(optOutFilename, "wb")) == NULL)
     {
-        dmError("Error creating output file '%s', %d: %s\n",
+        dmErrorMsg("Error creating output file '%s', %d: %s\n",
             optOutFilename, errno, strerror(errno));
         return 1;
     }
@@ -1035,9 +1035,9 @@
     
     if (result != 0)
     {
-        dmError("Error while saving JSSMOD file, %d: %s\n",
+        dmErrorMsg("Error while saving JSSMOD file, %d: %s\n",
             result, dmErrorStr(result));
-        dmError("WARNING: The resulting file may be broken!\n");
+        dmErrorMsg("WARNING: The resulting file may be broken!\n");
     }
     else
     {