Mercurial > hg > dmlib
changeset 1048:509e6ed3a24e
Finishing touches to the DM_DEBUG stuff.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sun, 01 Mar 2015 18:13:01 +0200 |
parents | b6c5e0c62588 |
children | 771e03bf9fcd |
files | Makefile.gen config.mak.in src/dmimage.c src/dmlib.h src/dmres.c |
diffstat | 5 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.gen Sun Mar 01 18:09:20 2015 +0200 +++ b/Makefile.gen Sun Mar 01 18:13:01 2015 +0200 @@ -19,9 +19,15 @@ DM_CFLAGS += -I$(DMLIBSRC) ifeq ($(EXTRA_CFLAGS),) -EXTRA_CFLAGS=-O3 -march=core2 -DDM_DEVEL +EXTRA_CFLAGS=-O3 -march=core2 endif +### +### Extra debug messages etc? +### +ifeq ($(DM_DEBUG),yes) +DM_CFLAGS += -DDM_DEBUG +endif ### ### Build demo target?
--- a/config.mak.in Sun Mar 01 18:09:20 2015 +0200 +++ b/config.mak.in Sun Mar 01 18:13:01 2015 +0200 @@ -3,6 +3,8 @@ DM_BUILD_TESTS=yes DM_BUILD_TOOLS=yes +# Build with additional error messages +DM_DEBUG=yes # Use zlib? If you say "no", zlib will be only used for # tools that need it, resource library decompression
--- a/src/dmimage.c Sun Mar 01 18:09:20 2015 +0200 +++ b/src/dmimage.c Sun Mar 01 18:13:01 2015 +0200 @@ -173,7 +173,7 @@ if (result == NULL) { - dmErrorDBG(DMERR_DATA_ERROR, + dmErrorDBGMsg( "Format conversion failed for image resource %p '%s' [%d, %d, %d].\n", file, file->filename, width, height, comp); }
--- a/src/dmlib.h Sun Mar 01 18:09:20 2015 +0200 +++ b/src/dmlib.h Sun Mar 01 18:13:01 2015 +0200 @@ -345,8 +345,10 @@ #ifdef DM_DEBUG # define dmErrorDBG dmError +# define dmErrorDBGMsg dmErrorMsg #else # define dmErrorDBG(ecode, fmt, ...) (ecode) // Dummy +# define dmErrorDBGMsg(fmt, ...) #endif void * dmMalloc(size_t);
--- a/src/dmres.c Sun Mar 01 18:09:20 2015 +0200 +++ b/src/dmres.c Sun Mar 01 18:13:01 2015 +0200 @@ -1068,7 +1068,7 @@ else { // Non-fatal - dmErrorDBG(DMERR_INIT_FAIL, + dmErrorDBGMsg( "Failed to open PACK, falling back to STDIO, '%s' %d: %s\n", lib->packFilename, ret, dmErrorStr(ret)); } @@ -1142,7 +1142,8 @@ int ret = dmPackClose(lib->packFile); if (ret != DMERR_OK) { - dmErrorDBG(ret, "Error closing PACK, #%i: %s\n", + dmErrorDBGMsg( + "Error closing PACK, #%i: %s\n", ret, dmErrorStr(ret)); } @@ -1195,7 +1196,7 @@ // Attempt to preload the resource if ((ret = dmResourcePreload(lib->preload)) != DMERR_OK) { - dmErrorDBG(ret, "Error preloading '%s', %d: %s\n", + dmErrorDBGMsg("Error preloading '%s', %d: %s\n", lib->preload->filename, ret, dmErrorStr(ret)); goto error; }