# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1349146355 -10800
# Node ID c6cdaa675801fa647175977df6957ca3c9884895
# Parent  7d201aed1fd9cf1f843bd416aa8bb1eb8cedf523
Add the file mode parameter to dmf_create_stdio() calls, and throw in some
cleanups.

diff -r 7d201aed1fd9 -r c6cdaa675801 efu.c
--- a/efu.c	Tue Oct 02 05:51:25 2012 +0300
+++ b/efu.c	Tue Oct 02 05:52:35 2012 +0300
@@ -336,7 +336,7 @@
     TTF_SetFontStyle(font, TTF_STYLE_NORMAL);
 
 
-    DMResource *res = dmf_create_stdio(optBitmapFilename);
+    DMResource *res = dmf_create_stdio(optBitmapFilename, "rb");
     if (res == NULL)
     {
         dmError("Could not open resource file '%s'.\n", optBitmapFilename);
diff -r 7d201aed1fd9 -r c6cdaa675801 testpl.c
--- a/testpl.c	Tue Oct 02 05:51:25 2012 +0300
+++ b/testpl.c	Tue Oct 02 05:52:35 2012 +0300
@@ -124,9 +124,10 @@
     // Open the files
     if (sname == NULL)
         file = dmf_create_stdio_stream(stdin);
-    else if ((file = dmf_create_stdio(sname)) == NULL)
+    else if ((file = dmf_create_stdio(sname, "rb")) == NULL)
     {
-        fprintf(stderr, "Error opening input file '%s'. (%s)\n", sname, strerror(errno));
+        fprintf(stderr, "Error opening input file '%s'. (%s)\n",
+            sname, strerror(errno));
         return 1;
     }
         
diff -r 7d201aed1fd9 -r c6cdaa675801 viewmod.c
--- a/viewmod.c	Tue Oct 02 05:51:25 2012 +0300
+++ b/viewmod.c	Tue Oct 02 05:52:35 2012 +0300
@@ -45,34 +45,34 @@
     
     switch (optN)
     {
-    case 0:
-        argShowHelp();
-        exit(0);
-        break;
+        case 0:
+            argShowHelp();
+            exit(0);
+            break;
 
-    case 1:
-        optViewPatterns = TRUE;
-        break;
+        case 1:
+            optViewPatterns = TRUE;
+            break;
 
-    case 2:
-        optViewInstruments = TRUE;
-        break;
+        case 2:
+            optViewInstruments = TRUE;
+            break;
 
-    case 3:
-        optViewGeneralInfo = TRUE;
-        break;
+        case 3:
+            optViewGeneralInfo = TRUE;
+            break;
 
-    case 4:
-        dmVerbosity++;
-        break;
+        case 4:
+            dmVerbosity++;
+            break;
 
-    case 5:
-        optViewExtInstruments = TRUE;
-        break;
+        case 5:
+            optViewExtInstruments = TRUE;
+            break;
 
-    default:
-        dmError("Unknown argument '%s'.\n", currArg);
-        return FALSE;
+        default:
+            dmError("Unknown argument '%s'.\n", currArg);
+            return FALSE;
     }
     
     return TRUE;
@@ -370,8 +370,8 @@
 int main(int argc, char *argv[])
 {
     int result = -1, i;
-    DMResource *inFile;
-    JSSModule *m;
+    DMResource *file;
+    JSSModule *mod;
 
     dmInitProg("viewmod", "miniJSS Module Viewer", "0.4", NULL, NULL);
     dmVerbosity = 0;
@@ -387,40 +387,41 @@
     // Open the file
     dmMsg(1, "Reading module file '%s'\n", optFilename);
     if (optFilename == NULL)
-        inFile = dmf_create_stdio_stream(stdin);
-    else if ((inFile = dmf_create_stdio(optFilename)) == NULL)
+        file = dmf_create_stdio_stream(stdin);
+    else if ((file = dmf_create_stdio(optFilename, "rb")) == NULL)
     {
-        fprintf(stderr, "Error opening input file '%s'. (%s)\n", optFilename, strerror(errno));
+        dmError("Error opening input file '%s'. (%s)\n",
+            optFilename, strerror(errno));
         return 1;
     }
 
     // Read module file
-    fprintf(stderr, "Reading file: %s\n", optFilename);
+    dmMsg(1, "Reading file: %s\n", optFilename);
 #ifdef JSS_SUP_XM
-    fprintf(stderr, "* Trying XM...\n");
-    result = jssLoadXM(inFile, &m);
+    dmMsg(1, "* Trying XM...\n");
+    result = jssLoadXM(file, &mod);
 #endif
 #ifdef JSS_SUP_JSSMOD
     if (result != 0)
     {
-        size_t bufgot, bufsize = dmfsize(inFile);
+        size_t bufgot, bufsize = dmfsize(file);
         Uint8 *buf = dmMalloc(bufsize);
-        dmfseek(inFile, 0L, SEEK_SET);
-        fprintf(stderr, "* Trying JSSMOD (%d bytes, %p)...\n", bufsize, buf);
-        if ((bufgot = dmfread(buf, 1, bufsize, inFile)) != bufsize)
+        dmfseek(file, 0L, SEEK_SET);
+        dmMsg(1, "* Trying JSSMOD (%d bytes, %p)...\n", bufsize, buf);
+        if ((bufgot = dmfread(buf, 1, bufsize, file)) != bufsize)
         {
-            fprintf(stderr, "Error reading file (not enough data %d), #%d: %s\n",
-                bufgot, dmferror(inFile), dmErrorStr(dmferror(inFile)));
+            dmError("Error reading file (not enough data %d), #%d: %s\n",
+                bufgot, dmferror(file), dmErrorStr(dmferror(file)));
             return 2;
         }
-        result = jssLoadJSSMOD(buf, bufsize, &m);
+        result = jssLoadJSSMOD(buf, bufsize, &mod);
         dmFree(buf);
     }
 #endif
-    dmf_close(inFile);
+    dmf_close(file);
     if (result != DMERR_OK)
     {
-        fprintf(stderr, "Error loading module file, %d: %s\n",
+        dmError("Error loading module file, %d: %s\n",
             result, dmErrorStr(result));
         return 3;
     }
@@ -431,10 +432,10 @@
 
     if (optViewPatterns)
     {
-        for (i = 0; i < m->npatterns; i++)
+        for (i = 0; i < mod->npatterns; i++)
         {
             printf("\nPattern #%03i:\n", i);
-            printPattern(stdout, m->patterns[i]);
+            printPattern(stdout, mod->patterns[i]);
         }
     }
 
@@ -444,10 +445,10 @@
         "ExtInstruments:\n"
         "---------------\n"
         );
-        for (i = 0; i < m->nextInstruments; i++)
+        for (i = 0; i < mod->nextInstruments; i++)
         {
             printf("#%03i: ", i);
-            printExtInstrument(stdout, m->extInstruments[i]);
+            printExtInstrument(stdout, mod->extInstruments[i]);
         }
     }
 
@@ -457,15 +458,16 @@
         "Instruments:\n"
         "------------\n"
         );
-        for (i = 0; i < m->ninstruments; i++)
+        for (i = 0; i < mod->ninstruments; i++)
         {
             printf("#%03i: ", i);
-            printInstrument(stdout, m->instruments[i]);
+            printInstrument(stdout, mod->instruments[i]);
         }
     }
 
     // Free module data
-    jssFreeModule(m);
+    jssFreeModule(mod);
+    jssClose();
 
     exit(0);
     return 0;
diff -r 7d201aed1fd9 -r c6cdaa675801 vptest.c
--- a/vptest.c	Tue Oct 02 05:51:25 2012 +0300
+++ b/vptest.c	Tue Oct 02 05:52:35 2012 +0300
@@ -174,7 +174,7 @@
     }
     TTF_SetFontStyle(font, TTF_STYLE_NORMAL);
 
-    DMResource *res = dmf_create_stdio(optBitmapFilename);
+    DMResource *res = dmf_create_stdio(optBitmapFilename, "rb");
     if (res == NULL)
     {
         dmError("Could not open resource file '%s'.\n", optBitmapFilename);