]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
shortened ZSTD_createCStream_Advanced()
authorYann Collet <cyan@fb.com>
Wed, 10 May 2017 18:06:06 +0000 (11:06 -0700)
committerYann Collet <cyan@fb.com>
Wed, 10 May 2017 18:06:06 +0000 (11:06 -0700)
https://github.com/facebook/zstd/pull/689#discussion_r115637613

lib/compress/zstd_compress.c

index 37590fca75e80821f4ca4961a12ad92a7547cebf..b1d799cdcaab46b8ad62cb14bda92ed6172b1f0d 100644 (file)
@@ -3136,16 +3136,8 @@ ZSTD_CStream* ZSTD_createCStream(void)
 
 ZSTD_CStream* ZSTD_createCStream_advanced(ZSTD_customMem customMem)
 {
-    ZSTD_CStream* zcs;
-
-    if (!customMem.customAlloc && !customMem.customFree) customMem = defaultCustomMem;
-    if (!customMem.customAlloc || !customMem.customFree) return NULL;
-
-    zcs = (ZSTD_CStream*)ZSTD_malloc(sizeof(ZSTD_CStream), customMem);
-    if (zcs==NULL) return NULL;
-    memset(zcs, 0, sizeof(ZSTD_CStream));
-    memcpy(&zcs->customMem, &customMem, sizeof(ZSTD_customMem));
-    return zcs;
+    /* CStream and CCtx are now same object */
+    return ZSTD_createCCtx_advanced(customMem);
 }
 
 size_t ZSTD_freeCStream(ZSTD_CStream* zcs)