# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1348796830 -10800
# Node ID fc097f7717dfd2c3654501893aadffccff58d18e
# Parent  d427763f113a6a30402b7aaa1399d9362ce8ba66
Fix JSSMod loading in viewmod and testpl.

diff -r d427763f113a -r fc097f7717df testpl.c
--- a/testpl.c	Fri Sep 28 04:37:57 2012 +0300
+++ b/testpl.c	Fri Sep 28 04:47:10 2012 +0300
@@ -144,12 +144,14 @@
 #ifdef JSS_SUP_JSSMOD
     if (result != 0)
     {
-        size_t bufsize = dmfsize(inFile);
+        size_t bufgot, bufsize = dmfsize(inFile);
         Uint8 *buf = dmMalloc(bufsize);
-        fprintf(stderr, "* Trying JSSMOD...\n");
-        if (dmfread(buf, 1, bufsize, inFile) != bufsize)
+        dmfseek(inFile, 0L, SEEK_SET);
+        fprintf(stderr, "* Trying JSSMOD (%d bytes, %p)...\n", bufsize, buf);
+        if ((bufgot = dmfread(buf, 1, bufsize, inFile)) != bufsize)
         {
-            fprintf(stderr, "Error reading file!\n");
+            fprintf(stderr, "Error reading file (not enough data %d), #%d: %s\n",
+                bufgot, dmferror(inFile), dmErrorStr(dmferror(inFile)));
             return 2;
         }
         result = jssLoadJSSMOD(buf, bufsize, &m);
@@ -158,9 +160,10 @@
 #endif
     dmf_close(inFile);
 
-    if (result != 0)
+    if (result != DMERR_OK)
     {
-        fprintf(stderr, "Error loading module file: %d\n", result);
+        fprintf(stderr, "Error loading module file, %d: %s\n",
+            result, dmErrorStr(result));
         return 3;
     }
 
diff -r d427763f113a -r fc097f7717df viewmod.c
--- a/viewmod.c	Fri Sep 28 04:37:57 2012 +0300
+++ b/viewmod.c	Fri Sep 28 04:47:10 2012 +0300
@@ -403,12 +403,14 @@
 #ifdef JSS_SUP_JSSMOD
     if (result != 0)
     {
-        size_t bufsize = dmfsize(inFile);
+        size_t bufgot, bufsize = dmfsize(inFile);
         Uint8 *buf = dmMalloc(bufsize);
-        fprintf(stderr, "* Trying JSSMOD...\n");
-        if (dmfread(buf, 1, bufsize, inFile) != bufsize)
+        dmfseek(inFile, 0L, SEEK_SET);
+        fprintf(stderr, "* Trying JSSMOD (%d bytes, %p)...\n", bufsize, buf);
+        if ((bufgot = dmfread(buf, 1, bufsize, inFile)) != bufsize)
         {
-            fprintf(stderr, "Error reading file!\n");
+            fprintf(stderr, "Error reading file (not enough data %d), #%d: %s\n",
+                bufgot, dmferror(inFile), dmErrorStr(dmferror(inFile)));
             return 2;
         }
         result = jssLoadJSSMOD(buf, bufsize, &m);
@@ -416,9 +418,10 @@
     }
 #endif
     dmf_close(inFile);
-    if (result != 0)
+    if (result != DMERR_OK)
     {
-        fprintf(stderr, "Error loading module file: %d\n", result);
+        fprintf(stderr, "Error loading module file, %d: %s\n",
+            result, dmErrorStr(result));
         return 3;
     }