From 82552447ba5a064305c4131a3edbd00a05d1db3a Mon Sep 17 00:00:00 2001 From: jxw Date: Sat, 14 Jun 2025 19:57:10 +0800 Subject: [PATCH] fix NULL Signed-off-by: jxw --- .../httpcapi_fuzzer/http_capi_fuzzer.cpp | 12 +++---- test/unittest/net_http/NetHttpTest.cpp | 16 ++++----- .../unittest/net_http/NetStackHashMapTest.cpp | 36 +++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/test/fuzztest/httpcapi_fuzzer/http_capi_fuzzer.cpp b/test/fuzztest/httpcapi_fuzzer/http_capi_fuzzer.cpp index 977101de3..2d9081715 100644 --- a/test/fuzztest/httpcapi_fuzzer/http_capi_fuzzer.cpp +++ b/test/fuzztest/httpcapi_fuzzer/http_capi_fuzzer.cpp @@ -88,7 +88,7 @@ void CreateRequestTest(const uint8_t *data, size_t size) } void Http_SampleResponseCallback(Http_Response *response, uint32_t errCode) { - if (response == NULL) { + if (response == nullptr) { return; } if (errCode != 0) { @@ -99,7 +99,7 @@ void Http_SampleResponseCallback(Http_Response *response, uint32_t errCode) { } size_t Http_SampleOnDataReceiveCallback(const char *data) { - if (data == NULL) { + if (data == nullptr) { return 0; } return 0; @@ -112,7 +112,7 @@ void Http_SampleOnDownloadProgressCallback(uint64_t totalSize, uint64_t transfer } void Http_SampleOnHeaderReceiveCallback(Http_Headers *headers) { - if (headers != NULL) { + if (headers != nullptr) { Http_HeaderEntry *entries = OH_Http_GetHeaderEntries(headers); Http_HeaderValue *headerValue; Http_HeaderEntry *delEntries = entries; @@ -144,12 +144,12 @@ void HttpRequestTest(const uint8_t *data, size_t size) return; } request->options = (Http_RequestOptions *)calloc(1, sizeof(Http_RequestOptions)); - if (request->options == NULL) { + if (request->options == nullptr) { OH_Http_Destroy(&request); return; } Http_Headers *headers = OH_Http_CreateHeaders(); - if (headers == NULL) { + if (headers == nullptr) { OH_Http_Destroy(&request); return; } @@ -165,7 +165,7 @@ void HttpRequestTest(const uint8_t *data, size_t size) return; } Http_HeaderValue *headValue = OH_Http_GetHeaderValue(headers, key); - if (headValue == NULL) { + if (headValue == nullptr) { NETSTACK_LOGE("headValue is nullptr"); } request->options->headers = headers; diff --git a/test/unittest/net_http/NetHttpTest.cpp b/test/unittest/net_http/NetHttpTest.cpp index ae6df493a..fc0df1c46 100644 --- a/test/unittest/net_http/NetHttpTest.cpp +++ b/test/unittest/net_http/NetHttpTest.cpp @@ -165,19 +165,19 @@ HWTEST_F(NetHttpTest, GetHeaderValue001, TestSize.Level1) EXPECT_TRUE(header != nullptr); header->fields = nullptr; Http_HeaderValue *value = OH_Http_GetHeaderValue(header, "key"); - EXPECT_EQ(value, NULL); + EXPECT_EQ(value, nullptr); OH_Http_DestroyHeaders(&header); } HWTEST_F(NetHttpTest, GetHeaderValue002, TestSize.Level1) { Http_HeaderValue *value = OH_Http_GetHeaderValue(nullptr, "key"); - EXPECT_EQ(value, NULL); + EXPECT_EQ(value, nullptr); Http_Headers *header = OH_Http_CreateHeaders(); EXPECT_TRUE(header != nullptr); value = OH_Http_GetHeaderValue(header, nullptr); - EXPECT_EQ(value, NULL); + EXPECT_EQ(value, nullptr); OH_Http_DestroyHeaders(&header); } @@ -187,18 +187,18 @@ HWTEST_F(NetHttpTest, GetHeaderValue003, TestSize.Level1) EXPECT_TRUE(header != nullptr); OH_Http_SetHeaderValue(header, "key1", "test1"); Http_HeaderValue *value = OH_Http_GetHeaderValue(header, "key1"); - EXPECT_TRUE(value != NULL); + EXPECT_TRUE(value != nullptr); OH_Http_DestroyHeaders(&header); } HWTEST_F(NetHttpTest, GetHeaderEntries001, TestSize.Level1) { - EXPECT_EQ(OH_Http_GetHeaderEntries(NULL), NULL); + EXPECT_EQ(OH_Http_GetHeaderEntries(nullptr), nullptr); Http_Headers *header = OH_Http_CreateHeaders(); EXPECT_TRUE(header != nullptr); header->fields = nullptr; - EXPECT_EQ(OH_Http_GetHeaderEntries(header), NULL); + EXPECT_EQ(OH_Http_GetHeaderEntries(header), nullptr); OH_Http_DestroyHeaders(&header); } @@ -207,7 +207,7 @@ HWTEST_F(NetHttpTest, GetHeaderEntries002, TestSize.Level1) Http_Headers *header = OH_Http_CreateHeaders(); EXPECT_TRUE(header != nullptr); header->fields->capacity = MAX_MAP_CAPACITY + 1; - EXPECT_EQ(OH_Http_GetHeaderEntries(header), NULL); + EXPECT_EQ(OH_Http_GetHeaderEntries(header), nullptr); OH_Http_DestroyHeaders(&header); } @@ -219,7 +219,7 @@ HWTEST_F(NetHttpTest, GetHeaderEntries003, TestSize.Level1) OH_Http_SetHeaderValue(header, "cc", "test2"); OH_Http_SetHeaderValue(header, "b", "test3"); - EXPECT_TRUE(OH_Http_GetHeaderEntries(header) != NULL); + EXPECT_TRUE(OH_Http_GetHeaderEntries(header) != nullptr); OH_Http_DestroyHeaders(&header); } diff --git a/test/unittest/net_http/NetStackHashMapTest.cpp b/test/unittest/net_http/NetStackHashMapTest.cpp index e065f65ca..0c7cf6da5 100644 --- a/test/unittest/net_http/NetStackHashMapTest.cpp +++ b/test/unittest/net_http/NetStackHashMapTest.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ -#include -#include -#include +#include +#include +#include #include "netstack_hash_map.h" #include "net_http_inner_types.h" @@ -57,7 +57,7 @@ HWTEST_F(NetstackHashMapTest, CreateMapTest001, TestSize.Level1) HWTEST_F(NetstackHashMapTest, NetstackInvalidMapTest001, TestSize.Level1) { Netstack_HashMap *map = CreateMap(); - map = NULL; + map = nullptr; const char *value = "value"; uint32_t ret = Netstack_PutMapEntry(map, "key", (void *)value); EXPECT_EQ(ret, OH_HTTP_PARAMETER_ERROR); @@ -67,7 +67,7 @@ HWTEST_F(NetstackHashMapTest, NetstackInvalidMapTest001, TestSize.Level1) HWTEST_F(NetstackHashMapTest, NetstackInvalidMapTest002, TestSize.Level1) { Netstack_HashMap *map = CreateMap(); - map->entries = NULL; + map->entries = nullptr; char *value = strdup("value"); uint32_t ret = Netstack_PutMapEntry(map, "key", value); EXPECT_EQ(ret, OH_HTTP_PARAMETER_ERROR); @@ -98,7 +98,7 @@ HWTEST_F(NetstackHashMapTest, NetstackResizeMapTest001, TestSize.Level1) { Netstack_HashMap *map = CreateMap(); EXPECT_TRUE(map != nullptr); - map->entries[0] = NULL; + map->entries[0] = nullptr; const char *value = "value"; Netstack_PutMapEntry(map, "key", (void *)value); Netstack_DestroyMap(map); @@ -109,7 +109,7 @@ HWTEST_F(NetstackHashMapTest, NetstackResizeMapTest002, TestSize.Level1) Netstack_HashMap *map = CreateMap(); EXPECT_TRUE(map != nullptr); map->entries[0] = (Netstack_HashMapEntry *)calloc(1, sizeof(Netstack_HashMapEntry)); - map->entries[0]->key = NULL; + map->entries[0]->key = nullptr; const char *value = "value"; Netstack_PutMapEntry(map, "key", (void *)value); Netstack_DestroyMap(map); @@ -119,7 +119,7 @@ HWTEST_F(NetstackHashMapTest, NetstackPutMapEntryTest001, TestSize.Level1) { Netstack_HashMap *map = CreateMap(); EXPECT_TRUE(map != nullptr); - char *key = NULL; + char *key = nullptr; const char *value = "value"; EXPECT_EQ(Netstack_PutMapEntry(map, key, (void *)value), OH_HTTP_PARAMETER_ERROR); Netstack_DestroyMap(map); @@ -128,7 +128,7 @@ HWTEST_F(NetstackHashMapTest, NetstackPutMapEntryTest001, TestSize.Level1) HWTEST_F(NetstackHashMapTest, NetstackPutMapEntryTest002, TestSize.Level1) { Netstack_HashMap *map = CreateMap(); - map = NULL; + map = nullptr; const char *key = "key"; const char *value = "value"; EXPECT_EQ(Netstack_PutMapEntry(map, key, (void *)value), OH_HTTP_PARAMETER_ERROR); @@ -171,8 +171,8 @@ HWTEST_F(NetstackHashMapTest, NetstackPutMapEntryTest005, TestSize.Level1) HWTEST_F(NetstackHashMapTest, NetstackGetMapEntryTest001, TestSize.Level1) { Netstack_HashMap *map = CreateMap(); - const char *key = NULL; - EXPECT_EQ(Netstack_GetMapEntry(map, key), NULL); + const char *key = nullptr; + EXPECT_EQ(Netstack_GetMapEntry(map, key), nullptr); Netstack_DestroyMap(map); } @@ -190,7 +190,7 @@ HWTEST_F(NetstackHashMapTest, NetstackGetMapEntryTest003, TestSize.Level1) { Netstack_HashMap *map = CreateMap(); const char *key = "a"; - EXPECT_EQ(Netstack_GetMapEntry(map, key), NULL); + EXPECT_EQ(Netstack_GetMapEntry(map, key), nullptr); Netstack_DestroyMap(map); } @@ -206,7 +206,7 @@ HWTEST_F(NetstackHashMapTest, NetstackDeleteMapEntryTest001, TestSize.Level1) HWTEST_F(NetstackHashMapTest, NetstackDeleteMapEntryTest002, TestSize.Level1) { Netstack_HashMap *map = CreateMap(); - char *key = NULL; + char *key = nullptr; EXPECT_EQ(Netstack_DeleteMapEntry(map, key), OH_HTTP_PARAMETER_ERROR); Netstack_DestroyMap(map); } @@ -245,7 +245,7 @@ HWTEST_F(NetstackHashMapTest, NetstackDestroyMapWithValueTest001, TestSize.Level Netstack_HashMap *map = CreateMap(); EXPECT_TRUE(map != nullptr); map->capacity = MAX_MAP_CAPACITY + 1; - Netstack_DestroyMapWithValue(map, NULL); + Netstack_DestroyMapWithValue(map, nullptr); } HWTEST_F(NetstackHashMapTest, NetstackDestroyMapWithValueTest002, TestSize.Level1) @@ -264,7 +264,7 @@ HWTEST_F(NetstackHashMapTest, NetstackDestroyMapWithValueTest002, TestSize.Level Netstack_HashMap *map = CreateMap(); map->capacity = MAX_MAP_CAPACITY + 1; Netstack_MapIterator *iterator = Netstack_CreateMapIterator(map); - EXPECT_EQ(iterator, NULL); + EXPECT_EQ(iterator, nullptr); Netstack_DestroyMap(map); } @@ -279,7 +279,7 @@ HWTEST_F(NetstackHashMapTest, NetstackCreateMapIteratorTest002, TestSize.Level1) Netstack_PutMapEntry(map, key2, (void *)value); Netstack_PutMapEntry(map, key3, (void *)value); Netstack_MapIterator *iterator = Netstack_CreateMapIterator(map); - EXPECT_FALSE(iterator == NULL); + EXPECT_FALSE(iterator == nullptr); Netstack_DestroyMapIterator(iterator); Netstack_DestroyMap(map); } @@ -288,13 +288,13 @@ HWTEST_F(NetstackHashMapTest, NetstackCreateMapIteratorTest003, TestSize.Level1) { Netstack_HashMap *map = CreateMap(); Netstack_MapIterator *iterator = Netstack_CreateMapIterator(map); - EXPECT_EQ(iterator, NULL); + EXPECT_EQ(iterator, nullptr); Netstack_DestroyMap(map); } HWTEST_F(NetstackHashMapTest, NetstackMapIterateNextTest001, TestSize.Level1) { - Netstack_MapIterateNext(NULL); + Netstack_MapIterateNext(nullptr); Netstack_HashMap *map = CreateMap(); EXPECT_TRUE(map != nullptr); -- Gitee