--- a/tools/xm2jss.c	Sun Apr 21 18:34:13 2013 +0300
+++ b/tools/xm2jss.c	Sun Apr 21 19:29:00 2013 +0300
@@ -912,8 +912,8 @@
 
 int main(int argc, char *argv[])
 {
-    DMResource *sfile = NULL;
-    FILE *dfile = NULL;
+    DMResource *inFile = NULL;
+    FILE *outFile = NULL;
     JSSModule *sm, *dm;
     int result;
 
@@ -933,10 +933,10 @@
     }
 
     // Read the source file
-    if ((sfile = dmf_create_stdio(optInFilename, "rb")) == NULL)
+    if ((result = dmf_create_stdio(optInFilename, "rb", &inFile)) != DMERR_OK)
     {
         dmError("Error opening input file '%s', %d: %s\n",
-            optInFilename, errno, strerror(errno));
+            optInFilename, result, dmErrorStr(result));
         return 1;
     }
 
@@ -945,8 +945,8 @@
 
     // Read file
     dmMsg(1, "Reading XM-format file ...\n");
-    result = jssLoadXM(sfile, &sm);
-    dmf_close(sfile);
+    result = jssLoadXM(inFile, &sm);
+    dmf_close(inFile);
     if (result != 0)
     {
         dmError("Error while loading XM file (%i), ", result);
@@ -1012,7 +1012,7 @@
         dm = sm;
 
     // Write output file
-    if ((dfile = fopen(optOutFilename, "wb")) == NULL)
+    if ((outFile = fopen(optOutFilename, "wb")) == NULL)
     {
         dmError("Error creating output file '%s', %d: %s\n",
             optOutFilename, errno, strerror(errno));
@@ -1022,9 +1022,9 @@
     dmMsg(1, "Writing JSSMOD-format file [patMode=0x%04x, samp8=0x%02x, samp16=0x%02x]\n",
         optPatternMode, optSampMode8, optSampMode16);
     
-    result = jssSaveJSSMOD(dfile, dm, optPatternMode, optSampMode8, optSampMode16);
+    result = jssSaveJSSMOD(outFile, dm, optPatternMode, optSampMode8, optSampMode16);
     
-    fclose(dfile);
+    fclose(outFile);
     
     if (result != 0)
     {