dolysis/rocksdb
3
0
Fork 0
mirror of https://github.com/facebook/rocksdb.git synced 2024-12-04 20:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deprecated use of 0/NULL in internal_repo_rocksdb/repo/util/xxhash.h + 5

Browse source 
Summary:
`nullptr` is typesafe. `0` and `NULL` are not. In the future, only `nullptr` will be allowed.

This diff helps us embrace the future _now_ in service of enabling `-Wzero-as-null-pointer-constant`.

Reviewed By: dmm-fb

Differential Revision: D55559752

fbshipit-source-id: 9f1edc836ded919022c4b53722f6f86208fecf8d
This commit is contained in:
Richard Barnes 2024-04-01 21:20:51 -07:00 committed by Andrew Kryczka
parent faae96da2e
commit 87d4df1f07
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
util/xxhash.h
View file

@ -2329,7 +2329,7 @@ XXH32_finalize(xxh_u32 hash, const xxh_u8* ptr, size_t len, XXH_alignment align)
hash = XXH_rotl32(hash, 17) * XXH_PRIME32_4; \ hash = XXH_rotl32(hash, 17) * XXH_PRIME32_4; \
} while (0) } while (0)
if (ptr==NULL) XXH_ASSERT(len == 0) if (ptr==nullptr) XXH_ASSERT(len == 0)
/* Compact rerolled version; generally faster */ /* Compact rerolled version; generally faster */
if (!XXH32_ENDJMP) { if (!XXH32_ENDJMP) {
@ -2409,7 +2409,7 @@ XXH32_endian_align(const xxh_u8* input, size_t len, xxh_u32 seed, XXH_alignment
{ {
xxh_u32 h32; xxh_u32 h32;
if (input==NULL) XXH_ASSERT(len == 0) if (input==nullptr) XXH_ASSERT(len == 0)
if (len>=16) { if (len>=16) {
const xxh_u8* const bEnd = input + len; const xxh_u8* const bEnd = input + len;
@ -2495,7 +2495,7 @@ XXH_PUBLIC_API XXH_errorcode XXH32_reset(XXH32_state_t* statePtr, XXH32_hash_t s
XXH_PUBLIC_API XXH_errorcode XXH_PUBLIC_API XXH_errorcode
XXH32_update(XXH32_state_t* state, const void* input, size_t len) XXH32_update(XXH32_state_t* state, const void* input, size_t len)
{ {
if (input==NULL) { if (input==nullptr) {
XXH_ASSERT(len == 0) XXH_ASSERT(len == 0)
return XXH_OK; return XXH_OK;
} }
@ -2802,7 +2802,7 @@ static xxh_u64 XXH64_avalanche(xxh_u64 hash)
static XXH_PUREF xxh_u64 static XXH_PUREF xxh_u64
XXH64_finalize(xxh_u64 hash, const xxh_u8* ptr, size_t len, XXH_alignment align) XXH64_finalize(xxh_u64 hash, const xxh_u8* ptr, size_t len, XXH_alignment align)
{ {
if (ptr==NULL) XXH_ASSERT(len == 0) if (ptr==nullptr) XXH_ASSERT(len == 0)
len &= 31; len &= 31;
while (len >= 8) { while (len >= 8) {
xxh_u64 const k1 = XXH64_round(0, XXH_get64bits(ptr)); xxh_u64 const k1 = XXH64_round(0, XXH_get64bits(ptr));
@ -2847,7 +2847,7 @@ XXH_FORCE_INLINE XXH_PUREF xxh_u64
XXH64_endian_align(const xxh_u8* input, size_t len, xxh_u64 seed, XXH_alignment align) XXH64_endian_align(const xxh_u8* input, size_t len, xxh_u64 seed, XXH_alignment align)
{ {
xxh_u64 h64; xxh_u64 h64;
if (input==NULL) XXH_ASSERT(len == 0) if (input==nullptr) XXH_ASSERT(len == 0)
if (len>=32) { if (len>=32) {
const xxh_u8* const bEnd = input + len; const xxh_u8* const bEnd = input + len;
@ -2936,7 +2936,7 @@ XXH_PUBLIC_API XXH_errorcode XXH64_reset(XXH_NOESCAPE XXH64_state_t* statePtr, X
XXH_PUBLIC_API XXH_errorcode XXH_PUBLIC_API XXH_errorcode
XXH64_update (XXH_NOESCAPE XXH64_state_t* state, XXH_NOESCAPE const void* input, size_t len) XXH64_update (XXH_NOESCAPE XXH64_state_t* state, XXH_NOESCAPE const void* input, size_t len)
{ {
if (input==NULL) { if (input==nullptr) {
XXH_ASSERT(len == 0) XXH_ASSERT(len == 0)
return XXH_OK; return XXH_OK;
} }
@ -5331,7 +5331,7 @@ XXH_PUBLIC_API XXH64_hash_t
XXH3_64bits_withSecretandSeed(XXH_NOESCAPE const void* input, size_t length, XXH_NOESCAPE const void* secret, size_t secretSize, XXH64_hash_t seed) XXH3_64bits_withSecretandSeed(XXH_NOESCAPE const void* input, size_t length, XXH_NOESCAPE const void* secret, size_t secretSize, XXH64_hash_t seed)
{ {
if (length <= XXH3_MIDSIZE_MAX) if (length <= XXH3_MIDSIZE_MAX)
return XXH3_64bits_internal(input, length, seed, XXH3_kSecret, sizeof(XXH3_kSecret), NULL); return XXH3_64bits_internal(input, length, seed, XXH3_kSecret, sizeof(XXH3_kSecret), nullptr);
return XXH3_hashLong_64b_withSecret(input, length, seed, (const xxh_u8*)secret, secretSize); return XXH3_hashLong_64b_withSecret(input, length, seed, (const xxh_u8*)secret, secretSize);
} }
@ -5368,7 +5368,7 @@ static XXH_MALLOCF void* XXH_alignedMalloc(size_t s, size_t align)
XXH_ASSERT(s != 0 && s < (s + align)) /* empty/overflow */ XXH_ASSERT(s != 0 && s < (s + align)) /* empty/overflow */
{ /* Overallocate to make room for manual realignment and an offset byte */ { /* Overallocate to make room for manual realignment and an offset byte */
xxh_u8* base = (xxh_u8*)XXH_malloc(s + align); xxh_u8* base = (xxh_u8*)XXH_malloc(s + align);
if (base != NULL) { if (base != nullptr) {
/* /*
* Get the offset needed to align this pointer. * Get the offset needed to align this pointer.
* *
@ -5385,7 +5385,7 @@ static XXH_MALLOCF void* XXH_alignedMalloc(size_t s, size_t align)
ptr[-1] = (xxh_u8)offset; ptr[-1] = (xxh_u8)offset;
return ptr; return ptr;
} }
return NULL; return nullptr;
} }
} }
/* /*

2
utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
View file

@ -165,7 +165,7 @@ static inline tokutime_t toku_time_now(void) {
static inline uint64_t toku_current_time_microsec(void) { static inline uint64_t toku_current_time_microsec(void) {
struct timeval t; struct timeval t;
gettimeofday(&t, NULL); gettimeofday(&t, nullptr);
return t.tv_sec * (1UL * 1000 * 1000) + t.tv_usec; return t.tv_sec * (1UL * 1000 * 1000) + t.tv_usec;
} }

6
utilities/transactions/lock/range/range_tree/lib/util/growable_array.h
View file

@ -78,7 +78,7 @@ class GrowableArray {
void init(void) void init(void)
// Effect: Initialize the array to contain no elements. // Effect: Initialize the array to contain no elements.
{ {
m_array = NULL; m_array = nullptr;
m_size = 0; m_size = 0;
m_size_limit = 0; m_size_limit = 0;
} }
@ -87,7 +87,7 @@ class GrowableArray {
// Effect: Deinitialize the array (freeing any memory it uses, for example). // Effect: Deinitialize the array (freeing any memory it uses, for example).
{ {
toku_free(m_array); toku_free(m_array);
m_array = NULL; m_array = nullptr;
m_size = 0; m_size = 0;
m_size_limit = 0; m_size_limit = 0;
} }
@ -113,7 +113,7 @@ class GrowableArray {
// constant. // constant.
{ {
if (m_size >= m_size_limit) { if (m_size >= m_size_limit) {
if (m_array == NULL) { if (m_array == nullptr) {
m_size_limit = 1; m_size_limit = 1;
} else { } else {
m_size_limit *= 2; m_size_limit *= 2;