moved memory handling to mem.c, mem.h

diff --git a/lib/rfxswf.c b/lib/rfxswf.c
index 2a4b2e2..d817479 100644 (file)
--- a/lib/rfxswf.c
+++ b/lib/rfxswf.c
@@ -24,6 +24,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 

+#include "mem.h"

 #include "rfxswf.h"
 
 #ifdef HAVE_JPEGLIB
 #include "rfxswf.h"
 
 #ifdef HAVE_JPEGLIB

@@ -48,88 +49,6 @@
 #include "./bitio.h"
 #include "./MD5.h"
 
 #include "./bitio.h"
 #include "./MD5.h"
 

-// memory allocation
-
-void* rfx_alloc(int size)
-{
-  void*ptr;
-  if(size == 0) {
-    //*(int*)0 = 0xdead;
-    //fprintf(stderr, "Warning: Zero alloc\n");
-    return 0;
-  }
-
-  ptr = malloc(size);
-  if(!ptr) {
-    fprintf(stderr, "FATAL: Out of memory (while trying to claim %d bytes)\n", size);
-    /* TODO: we should send a signal, so that the debugger kicks in? */
-    exit(1);
-  }
-  return ptr;
-}
-void* rfx_realloc(void*data, int size)
-{
-  void*ptr;
-  if(size == 0) {
-    //*(int*)0 = 0xdead;
-    //fprintf(stderr, "Warning: Zero realloc\n");
-    rfx_free(data);
-    return 0;
-  }
-  if(!data) {
-    ptr = malloc(size);
-  } else {
-    ptr = realloc(data, size);
-  }
-
-  if(!ptr) {
-    fprintf(stderr, "FATAL: Out of memory (while trying to claim %d bytes)\n", size);
-    /* TODO: we should send a signal, so that the debugger kicks in? */
-    exit(1);
-  }
-  return ptr;
-}
-void* rfx_calloc(int size)
-{
-  void*ptr;
-  if(size == 0) {
-    //*(int*)0 = 0xdead;
-    //fprintf(stderr, "Warning: Zero alloc\n");
-    return 0;
-  }
-#ifdef HAVE_CALLOC
-  ptr = calloc(size);
-#else
-  ptr = malloc(size);
-#endif
-  if(!ptr) {
-    fprintf(stderr, "FATAL: Out of memory (while trying to claim %d bytes)\n", size);
-    /* TODO: we should send a signal, so that the debugger kicks in? */
-    exit(1);
-  }
-#ifndef HAVE_CALLOC
-  memset(ptr, 0, size);
-#endif
-  return ptr;
-}
-
-void rfx_free(void*ptr)
-{
-  if(!ptr)
-    return;
-  free(ptr);
-}
-
-#ifdef MEMORY_INFO
-long rfx_memory_used()
-{
-}
-
-char* rfx_memory_used_str()
-{
-}
-#endif
-

 // internal constants
 
 #define MALLOC_SIZE     128
 // internal constants
 
 #define MALLOC_SIZE     128

@@ -633,6 +552,7 @@ int swf_SetMatrix(TAG * t,MATRIX * m)
     nbits = swf_CountBits(m->sx,0);
     nbits = swf_CountBits(m->sy,nbits);
     if(nbits>=32) {
     nbits = swf_CountBits(m->sx,0);
     nbits = swf_CountBits(m->sy,nbits);
     if(nbits>=32) {

+        /* TODO: happens on AMD64 systems for normal values? */

        fprintf(stderr,"rfxswf: Error: matrix values too large\n");
        nbits = 31;
     }
        fprintf(stderr,"rfxswf: Error: matrix values too large\n");
        nbits = 31;
     }

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 88d33e4..9189cf4 100644 (file)
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -38,6 +38,7 @@ extern "C" {
 #include "../config.h"
 #include "./bitio.h"
 #include "./drawer.h"
 #include "../config.h"
 #include "./bitio.h"
 #include "./drawer.h"

+#include "./mem.h"

 
 #define DEBUG_RFXSWF
 #ifdef RFXSWF_DISABLESOUND
 
 #define DEBUG_RFXSWF
 #ifdef RFXSWF_DISABLESOUND

@@ -72,16 +73,6 @@ extern "C" {
 #define REVERSESWAP32(s) (REVERSESWAP16(((s)>>16)&0x0000ffff)|((REVERSESWAP16(s)<<16)&0xffff0000))
 #endif
 
 #define REVERSESWAP32(s) (REVERSESWAP16(((s)>>16)&0x0000ffff)|((REVERSESWAP16(s)<<16)&0xffff0000))
 #endif
 

-#define ALLOC_ARRAY(type, num) (((type)*)rfxalloc(sizeof(type)*(num)))
-void* rfx_alloc(int size);
-void* rfx_calloc(int size);
-void* rfx_realloc(void*data, int size);
-void rfx_free(void*data);
-#ifdef MEMORY_INFO
-long rfx_memory_used();
-char* rfx_memory_used_str();
-#endif
-

 // SWF Types
 
 typedef         unsigned long   U32;
 // SWF Types
 
 typedef         unsigned long   U32;