changeset 995:aeafd6d44465

Move and rename a constant define.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 01 Mar 2015 02:39:18 +0200
parents e8de4fbc03b6
children acda8cfc9119
files src/dmpack.h src/dmres.c
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/dmpack.h	Sat Feb 28 15:59:39 2015 +0200
+++ b/src/dmpack.h	Sun Mar 01 02:39:18 2015 +0200
@@ -11,7 +11,6 @@
 
 #define	DPACK_IDENT     "TNSPDPCK"      // Magic ident
 #define	DPACK_VERSION   (0x0120)        // Version
-#define	DPACK_TMPSIZE   (128 * 1024)
 
 
 typedef struct _DMPackEntry
--- a/src/dmres.c	Sat Feb 28 15:59:39 2015 +0200
+++ b/src/dmres.c	Sun Mar 01 02:39:18 2015 +0200
@@ -334,6 +334,8 @@
 
 #ifdef DM_USE_ZLIB
 
+#define	DMRES_TMPBUF_SIZE   (128 * 1024)
+
 static int dm_pack_decompress(DMResource *handle, DMPackEntry *node)
 {
     int res = DMERR_OK, cres, cdataLeft;
@@ -341,7 +343,7 @@
     Uint8 * cbuffer = NULL;
 
     // Allocate a structures and buffers
-    cbuffer = (Uint8 *) dmMalloc(DPACK_TMPSIZE);
+    cbuffer = (Uint8 *) dmMalloc(DMRES_TMPBUF_SIZE);
     if (cbuffer == NULL)
     {
         res = DMERR_MALLOC;
@@ -379,7 +381,7 @@
     {
         cstream.avail_in = fread(
             cbuffer, sizeof(Uint8),
-            (cdataLeft >= DPACK_TMPSIZE) ? DPACK_TMPSIZE : cdataLeft,
+            (cdataLeft >= DMRES_TMPBUF_SIZE) ? DMRES_TMPBUF_SIZE : cdataLeft,
             handle->lib->packFile->file);
 
         cdataLeft -= cstream.avail_in;