From 7a1c5c784837a507721680208a6202ed976c1739 Mon Sep 17 00:00:00 2001 From: 3gg <3gg@shellblade.net> Date: Mon, 30 Jun 2025 19:31:09 -0700 Subject: Use nullptr --- mem/test/mem_test.c | 28 ++++++++++++++-------------- mempool/test/mempool_test.c | 16 ++++++++-------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mem/test/mem_test.c b/mem/test/mem_test.c index 88c8b14..a8d482f 100644 --- a/mem/test/mem_test.c +++ b/mem/test/mem_test.c @@ -39,7 +39,7 @@ TEST_CASE(mem_fully_allocate) { for (int i = 0; i < NUM_BLOCKS; ++i) { const int* block = mem_alloc(&mem, 1); - TEST_TRUE(block != 0); + TEST_TRUE(block != nullptr); } TEST_TRUE(mem_size(&mem) == NUM_BLOCKS); @@ -50,15 +50,15 @@ TEST_CASE(mem_fill_then_free) { test_mem mem; mem_make(&mem); - int* blocks[NUM_BLOCKS] = {0}; + int* blocks[NUM_BLOCKS] = {nullptr}; for (int i = 0; i < NUM_BLOCKS; i++) { blocks[i] = mem_alloc(&mem, 1); - TEST_TRUE(blocks[i] != 0); + TEST_TRUE(blocks[i] != nullptr); } for (int i = 0; i < NUM_BLOCKS; i++) { mem_free(&mem, &blocks[i]); - TEST_EQUAL(blocks[i], 0); // Pointer should be set to 0 on free. + TEST_EQUAL(blocks[i], nullptr); // Pointer should be set to 0 on free. } TEST_EQUAL(count(&mem), 0); @@ -74,12 +74,12 @@ TEST_CASE(mem_allocate_beyond_max_size) { // Fully allocate the mem. for (int i = 0; i < NUM_BLOCKS; ++i) { - TEST_TRUE(mem_alloc(&mem, 1) != 0); + TEST_TRUE(mem_alloc(&mem, 1) != nullptr); } // Past the end. for (int i = 0; i < NUM_BLOCKS; ++i) { - TEST_EQUAL(mem_alloc(&mem, 1), 0); + TEST_EQUAL(mem_alloc(&mem, 1), nullptr); } TEST_TRUE(mem_size(&mem) == NUM_BLOCKS); @@ -105,7 +105,7 @@ TEST_CASE(mem_zero_free_block_after_free) { mem_make(&mem); int* val = mem_alloc(&mem, 1); - TEST_TRUE(val != 0); + TEST_TRUE(val != nullptr); *val = 177; int* old_val = val; @@ -131,7 +131,7 @@ TEST_CASE(mem_traverse_partially_full) { for (int i = 0; i < N; ++i) { int* val = mem_alloc(&mem, 1); - TEST_TRUE(val != 0); + TEST_TRUE(val != nullptr); *val = i + 1; } @@ -146,7 +146,7 @@ TEST_CASE(mem_traverse_full) { for (int i = 0; i < NUM_BLOCKS; ++i) { int* val = mem_alloc(&mem, 1); - TEST_TRUE(val != 0); + TEST_TRUE(val != nullptr); *val = i + 1; } @@ -161,7 +161,7 @@ TEST_CASE(mem_get_block) { for (int i = 0; i < NUM_BLOCKS; ++i) { int* block = mem_alloc(&mem, 1); - TEST_TRUE(block != 0); + TEST_TRUE(block != nullptr); *block = i; TEST_EQUAL(mem_get_chunk_handle(&mem, block), (size_t)i); } @@ -179,7 +179,7 @@ TEST_CASE(mem_fragmentation) { test_mem mem; mem_make(&mem); - int* blocks[NUM_BLOCKS] = {0}; + int* blocks[NUM_BLOCKS] = {nullptr}; int next_block = 0; #define ALLOC(num_blocks) \ @@ -205,7 +205,7 @@ TEST_CASE(mem_fragmentation) { // Should be able to allocate 1 chunk of N blocks. const void* chunk = mem_alloc(&mem, NUM_BLOCKS); - TEST_TRUE(chunk != 0); + TEST_TRUE(chunk != nullptr); } // Clear and re-use an allocator. @@ -216,7 +216,7 @@ TEST_CASE(mem_clear_then_reuse) { // Allocate chunks, contents not important. for (int i = 0; i < NUM_BLOCKS; ++i) { int* chunk = mem_alloc(&mem, 1); - TEST_TRUE(chunk != 0); + TEST_TRUE(chunk != nullptr); } mem_clear(&mem); @@ -226,7 +226,7 @@ TEST_CASE(mem_clear_then_reuse) { // Allocate chunks and assign values 0..N. for (int i = 0; i < NUM_BLOCKS; ++i) { int* chunk = mem_alloc(&mem, 1); - TEST_TRUE(chunk != 0); + TEST_TRUE(chunk != nullptr); *chunk = i + 1; } diff --git a/mempool/test/mempool_test.c b/mempool/test/mempool_test.c index 4c55e4b..6d904bc 100644 --- a/mempool/test/mempool_test.c +++ b/mempool/test/mempool_test.c @@ -39,7 +39,7 @@ TEST_CASE(mempool_allocate_until_full) { for (int i = 0; i < NUM_BLOCKS; ++i) { const int* block = mempool_alloc(&pool); - TEST_TRUE(block != 0); + TEST_TRUE(block != nullptr); } TEST_TRUE(mempool_size(&pool) == NUM_BLOCKS); @@ -50,10 +50,10 @@ TEST_CASE(mempool_fill_then_free) { test_pool pool; mempool_make(&pool); - int* blocks[NUM_BLOCKS] = {0}; + int* blocks[NUM_BLOCKS] = {nullptr}; for (int i = 0; i < NUM_BLOCKS; ++i) { blocks[i] = mempool_alloc(&pool); - TEST_TRUE(blocks[i] != 0); + TEST_TRUE(blocks[i] != nullptr); } for (int i = 0; i < NUM_BLOCKS; ++i) { @@ -74,7 +74,7 @@ TEST_CASE(mempool_allocate_beyond_max_size) { // Fully allocate the pool. for (int i = 0; i < NUM_BLOCKS; ++i) { - TEST_TRUE(mempool_alloc(&pool) != 0); + TEST_TRUE(mempool_alloc(&pool) != nullptr); } // Past the end. @@ -105,7 +105,7 @@ TEST_CASE(mempool_zero_free_block_after_free) { mempool_make(&pool); int* val = mempool_alloc(&pool); - TEST_TRUE(val != 0); + TEST_TRUE(val != nullptr); *val = 177; int* old_val = val; @@ -131,7 +131,7 @@ TEST_CASE(mempool_traverse_partially_full) { for (int i = 0; i < N; ++i) { int* val = mempool_alloc(&pool); - TEST_TRUE(val != 0); + TEST_TRUE(val != nullptr); *val = i + 1; } @@ -146,7 +146,7 @@ TEST_CASE(mempool_traverse_full) { for (int i = 0; i < NUM_BLOCKS; ++i) { int* val = mempool_alloc(&pool); - TEST_TRUE(val != 0); + TEST_TRUE(val != nullptr); *val = i + 1; } @@ -161,7 +161,7 @@ TEST_CASE(mempool_get_block) { for (int i = 0; i < NUM_BLOCKS; ++i) { int* block = mempool_alloc(&pool); - TEST_TRUE(block != 0); + TEST_TRUE(block != nullptr); *block = i; TEST_EQUAL(mempool_get_block_index(&pool, block), (size_t)i); } -- cgit v1.2.3