ensure consistent definition and usage of FREEMEM

as suggested by @sloutsky in #671

diff --git a/lib/lz4frame.c b/lib/lz4frame.c
index 19efd0b..42124e9 100644 (file)
--- a/lib/lz4frame.c
+++ b/lib/lz4frame.c
@@ -72,15 +72,15 @@
  * by modifying below section.
  */
 #include <stdlib.h>   /* malloc, calloc, free */
-#define ALLOC(s)       malloc(s)
 #ifndef LZ4_SRC_INCLUDED   /* avoid redefinition when sources are coalesced */
-#  define ALLOC_AND_ZERO(s)  calloc(1,(s))
+#  define ALLOC(s)          malloc(s)
+#  define ALLOC_AND_ZERO(s) calloc(1,(s))
+#  define FREEMEM(p)        free(p)
 #endif
-#define FREEMEM(p)     free(p)
 
 #include <string.h>   /* memset, memcpy, memmove */
 #ifndef LZ4_SRC_INCLUDED  /* avoid redefinition when sources are coalesced */
-#  define MEM_INIT       memset
+#  define MEM_INIT(p,v,s)   memset((p),(v),(s))
 #endif
 
 

diff --git a/lib/lz4hc.c b/lib/lz4hc.c
index f6ed779..d5f6743 100644 (file)
--- a/lib/lz4hc.c
+++ b/lib/lz4hc.c
@@ -868,7 +868,7 @@ int LZ4_compress_HC(const char* src, char* dst, int srcSize, int dstCapacity, in
 #endif
     int const cSize = LZ4_compress_HC_extStateHC(statePtr, src, dst, srcSize, dstCapacity, compressionLevel);
 #if defined(LZ4HC_HEAPMODE) && LZ4HC_HEAPMODE==1
-    free(statePtr);
+    FREEMEM(statePtr);
 #endif
     return cSize;
 }
@@ -901,7 +901,7 @@ int LZ4_freeStreamHC (LZ4_streamHC_t* LZ4_streamHCPtr)
 {
     DEBUGLOG(4, "LZ4_freeStreamHC(%p)", LZ4_streamHCPtr);
     if (!LZ4_streamHCPtr) return 0;  /* support free on NULL */
-    free(LZ4_streamHCPtr);
+    FREEMEM(LZ4_streamHCPtr);
     return 0;
 }