Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev

diff --cc lib/common/mem.h
Simple merge

diff --cc lib/compress/zbuff_compress.c
Simple merge

diff --cc lib/compress/zstd_compress.c
Simple merge

diff --cc programs/Makefile
Simple merge

diff --cc programs/fileio.c
Simple merge

diff --cc programs/tests/playTests.sh
Simple merge

diff --cc programs/zbufftest.c
index d7f7ac00d0c2eebfe238416a1422f6a96f0f9476,c350fabb9c3574f4c1f2f4b0ddbb76a62cbc83f7..e9e54586cf6924550b2e883ea2c0f9dfb4a14e48
--- 1/programs/zbufftest.c
--- 2/programs/zbufftest.c
+++ b/programs/zbufftest.c
@@@ -153,11 -136,10 +149,10 @@@ static int basicUnitTests(U32 seed, dou
      void* compressedBuffer = malloc(compressedBufferSize);
      size_t const decodedBufferSize = CNBufferSize;
      void* decodedBuffer = malloc(decodedBufferSize);
-     U32 randState = seed;
      size_t result, cSize, readSize, genSize;
      U32 testNb=0;
 -    ZBUFF_CCtx* zc = ZBUFF_createCCtx();
 -    ZBUFF_DCtx* zd = ZBUFF_createDCtx();
 +    ZBUFF_CCtx* zc = ZBUFF_createCCtx_advanced(customMem);
 +    ZBUFF_DCtx* zd = ZBUFF_createDCtx_advanced(customMem);
  
      /* Create compressible test buffer */
      if (!CNBuffer || !compressedBuffer || !decodedBuffer || !zc || !zd) {

diff --cc programs/zstdcli.c
Simple merge