Mercurial > hg > dmlib
changeset 8:fc097f7717df
Fix JSSMod loading in viewmod and testpl.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 28 Sep 2012 04:47:10 +0300 |
parents | d427763f113a |
children | c42ee907de9c |
files | testpl.c viewmod.c |
diffstat | 2 files changed, 18 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- 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; }
--- 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; }