Skip to content

Commit 1a94b94

Browse files
committed
test: fix test library
Signed-off-by: Paolo Insogna <paolo@cowtech.it>
1 parent be31bc6 commit 1a94b94

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

test/ffi/fixture_library/ffi_test_library.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,17 @@ FFI_EXPORT uint64_t string_length(const char* str) {
9191

9292
FFI_EXPORT char* string_concat(const char* a, const char* b) {
9393
if (!a || !b) {
94-
return nullptr;
94+
// NOLINTNEXTLINE (readability/null_usage)
95+
return NULL;
9596
}
9697

9798
size_t len_a = strlen(a);
9899
size_t len_b = strlen(b);
99100
char* result = malloc(len_a + len_b + 1);
100101

101102
if (!result) {
102-
return nullptr;
103+
// NOLINTNEXTLINE (readability/null_usage)
104+
return NULL;
103105
}
104106

105107
memcpy(result, a, len_a);
@@ -109,14 +111,16 @@ FFI_EXPORT char* string_concat(const char* a, const char* b) {
109111

110112
FFI_EXPORT char* string_duplicate(const char* str) {
111113
if (!str) {
112-
return nullptr;
114+
// NOLINTNEXTLINE (readability/null_usage)
115+
return NULL;
113116
}
114117

115118
size_t len = strlen(str);
116119
char* result = malloc(len + 1);
117120

118121
if (!result) {
119-
return nullptr;
122+
// NOLINTNEXTLINE (readability/null_usage)
123+
return NULL;
120124
}
121125

122126
memcpy(result, str, len + 1);
@@ -249,12 +253,13 @@ FFI_EXPORT int8_t call_int8_callback(Int8Callback callback, int8_t value) {
249253
return callback(value);
250254
}
251255

252-
FFI_EXPORT int32_t call_pointer_callback_is_nullptr(PointerCallback callback) {
256+
FFI_EXPORT int32_t call_pointer_callback_is_null(PointerCallback callback) {
253257
if (!callback) {
254258
return 1;
255259
}
256260

257-
return callback() == nullptr;
261+
// NOLINTNEXTLINE (readability/null_usage)
262+
return callback() == NULL;
258263
}
259264

260265
FFI_EXPORT void call_void_callback(VoidCallback callback) {
@@ -309,7 +314,7 @@ FFI_EXPORT void deallocate_memory(void* ptr) {
309314
free(ptr);
310315
}
311316

312-
// nullptr pointer handling.
317+
// NULL pointer handling.
313318
FFI_EXPORT int32_t safe_strlen(const char* str) {
314319
return str ? (int32_t)strlen(str) : -1;
315320
}

0 commit comments

Comments
 (0)