diff options
Diffstat (limited to 'lib/zstd/common/zstd_common.c')
| -rw-r--r-- | lib/zstd/common/zstd_common.c | 38 | 
1 files changed, 2 insertions, 36 deletions
| diff --git a/lib/zstd/common/zstd_common.c b/lib/zstd/common/zstd_common.c index 3d7e35b309b5..44b95b25344a 100644 --- a/lib/zstd/common/zstd_common.c +++ b/lib/zstd/common/zstd_common.c @@ -1,5 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause  /* - * Copyright (c) Yann Collet, Facebook, Inc. + * Copyright (c) Meta Platforms, Inc. and affiliates.   * All rights reserved.   *   * This source code is licensed under both the BSD-style license (found in the @@ -14,7 +15,6 @@  *  Dependencies  ***************************************/  #define ZSTD_DEPS_NEED_MALLOC -#include "zstd_deps.h"   /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */  #include "error_private.h"  #include "zstd_internal.h" @@ -47,37 +47,3 @@ ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); }  /*! ZSTD_getErrorString() :   *  provides error code string from enum */  const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); } - - - -/*=************************************************************** -*  Custom allocator -****************************************************************/ -void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) -{ -    if (customMem.customAlloc) -        return customMem.customAlloc(customMem.opaque, size); -    return ZSTD_malloc(size); -} - -void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) -{ -    if (customMem.customAlloc) { -        /* calloc implemented as malloc+memset; -         * not as efficient as calloc, but next best guess for custom malloc */ -        void* const ptr = customMem.customAlloc(customMem.opaque, size); -        ZSTD_memset(ptr, 0, size); -        return ptr; -    } -    return ZSTD_calloc(1, size); -} - -void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) -{ -    if (ptr!=NULL) { -        if (customMem.customFree) -            customMem.customFree(customMem.opaque, ptr); -        else -            ZSTD_free(ptr); -    } -} | 
