From 3f0b34166e13dfc5ffe9567c180d926b99e9de73 Mon Sep 17 00:00:00 2001 From: TaowerfulMAX Date: Sat, 6 Sep 2025 19:12:52 +0800 Subject: [PATCH] fix: unsigned value less than zero fix Signed-off-by: TaowerfulMAX --- device/base/test/unittest/common_test.cpp | 2 +- .../cpu_plugin/test/unittest/cpu_data_plugin_unittest.cpp | 2 +- .../test/unittest/diskio_data_plugin_unittest.cpp | 2 +- .../ftrace_plugin/test/unittest/flow_controller_test.cpp | 2 +- .../ftrace_plugin/test/unittest/ftrace_fs_ops_test.cpp | 2 +- .../ftrace_plugin/test/unittest/ftrace_parser_test.cpp | 2 +- .../ftrace_plugin/test/unittest/result_transporter_test.cpp | 2 +- .../gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp | 4 ++-- .../hidump_plugin/test/unittest/hidump_plugin_unittest.cpp | 2 +- .../hilog_plugin/test/unittest/hilog_plugin_unittest.cpp | 2 +- .../hiperf_plugin/test/unittest/hiperf_plugin_unittest.cpp | 2 +- .../test/unittest/hisysevent_plugin_unittest.cpp | 2 +- .../test/unittest/memory_data_plugin_unittest.cpp | 4 ++-- .../network_plugin/test/unittest/network_plugin_test.cpp | 4 ++-- .../process_plugin/test/unittest/process_plugin_unittest.cpp | 2 +- .../xpower_plugin/test/unittest/xpower_plugin_unittest.cpp | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/device/base/test/unittest/common_test.cpp b/device/base/test/unittest/common_test.cpp index d8b13e44b..fbe2c5021 100644 --- a/device/base/test/unittest/common_test.cpp +++ b/device/base/test/unittest/common_test.cpp @@ -39,7 +39,7 @@ protected: } size_t len = fwrite(const_cast(fileContent.c_str()), 1, fileContent.length(), file); - if (len < 0) { + if (len != fileContent.length()) { std::string errorMsg = GetErrorMsg(); PROFILER_LOG_ERROR(LOG_CORE, "WriteFile: fwrite() fail, %s", errorMsg.c_str()); (void)fclose(file); diff --git a/device/plugins/cpu_plugin/test/unittest/cpu_data_plugin_unittest.cpp b/device/plugins/cpu_plugin/test/unittest/cpu_data_plugin_unittest.cpp index e2ae0d138..322b69b49 100644 --- a/device/plugins/cpu_plugin/test/unittest/cpu_data_plugin_unittest.cpp +++ b/device/plugins/cpu_plugin/test/unittest/cpu_data_plugin_unittest.cpp @@ -157,7 +157,7 @@ string Getexepath() char buf[PATH_MAX] = ""; std::string path = "/proc/self/exe"; size_t rslt = readlink(path.c_str(), buf, sizeof(buf)); - if (rslt < 0 || (rslt >= sizeof(buf))) { + if (rslt >= sizeof(buf)) { return ""; } buf[rslt] = '\0'; diff --git a/device/plugins/diskio_plugin/test/unittest/diskio_data_plugin_unittest.cpp b/device/plugins/diskio_plugin/test/unittest/diskio_data_plugin_unittest.cpp index e9f3c3ce5..46791a239 100644 --- a/device/plugins/diskio_plugin/test/unittest/diskio_data_plugin_unittest.cpp +++ b/device/plugins/diskio_plugin/test/unittest/diskio_data_plugin_unittest.cpp @@ -55,7 +55,7 @@ string Getexepath() char buf[PATH_MAX] = ""; std::string path = "/proc/self/exe"; size_t rslt = readlink(path.c_str(), buf, sizeof(buf)); - if (rslt < 0 || (rslt >= sizeof(buf))) { + if (rslt >= sizeof(buf)) { return ""; } buf[rslt] = '\0'; diff --git a/device/plugins/ftrace_plugin/test/unittest/flow_controller_test.cpp b/device/plugins/ftrace_plugin/test/unittest/flow_controller_test.cpp index 02f78f1e8..c637e8dd5 100644 --- a/device/plugins/ftrace_plugin/test/unittest/flow_controller_test.cpp +++ b/device/plugins/ftrace_plugin/test/unittest/flow_controller_test.cpp @@ -48,7 +48,7 @@ protected: long WriteFunc(WriterStructPtr writer, ConstVoidPtr data, size_t size) { - if (writer == nullptr || data == nullptr || size <= 0) { + if (writer == nullptr || data == nullptr || size == 0) { return -1; } diff --git a/device/plugins/ftrace_plugin/test/unittest/ftrace_fs_ops_test.cpp b/device/plugins/ftrace_plugin/test/unittest/ftrace_fs_ops_test.cpp index 160aaa33f..dcefabc9e 100644 --- a/device/plugins/ftrace_plugin/test/unittest/ftrace_fs_ops_test.cpp +++ b/device/plugins/ftrace_plugin/test/unittest/ftrace_fs_ops_test.cpp @@ -72,7 +72,7 @@ protected: long WriteFunc(WriterStructPtr writer, ConstVoidPtr data, size_t size) { - if (writer == nullptr || data == nullptr || size <= 0) { + if (writer == nullptr || data == nullptr || size == 0) { return -1; } diff --git a/device/plugins/ftrace_plugin/test/unittest/ftrace_parser_test.cpp b/device/plugins/ftrace_plugin/test/unittest/ftrace_parser_test.cpp index 433571ae4..fe115eafd 100644 --- a/device/plugins/ftrace_plugin/test/unittest/ftrace_parser_test.cpp +++ b/device/plugins/ftrace_plugin/test/unittest/ftrace_parser_test.cpp @@ -80,7 +80,7 @@ protected: long WriteFunc(WriterStructPtr writer, ConstVoidPtr data, size_t size) { - if (writer == nullptr || data == nullptr || size <= 0) { + if (writer == nullptr || data == nullptr || size == 0) { return -1; } diff --git a/device/plugins/ftrace_plugin/test/unittest/result_transporter_test.cpp b/device/plugins/ftrace_plugin/test/unittest/result_transporter_test.cpp index ef8b0ff78..b0f28f642 100644 --- a/device/plugins/ftrace_plugin/test/unittest/result_transporter_test.cpp +++ b/device/plugins/ftrace_plugin/test/unittest/result_transporter_test.cpp @@ -43,7 +43,7 @@ protected: long WriteFunc(WriterStructPtr writer, ConstVoidPtr data, size_t size) { - if (writer == nullptr || data == nullptr || size <= 0) { + if (writer == nullptr || data == nullptr || size == 0) { return -1; } diff --git a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp index f883a8a81..d72cd7ea2 100644 --- a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp +++ b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp @@ -58,7 +58,7 @@ string Getexepath() char buf[PATH_MAX] = ""; std::string path = "/proc/self/exe"; size_t rslt = readlink(path.c_str(), buf, sizeof(buf)); - if (rslt < 0 || (rslt >= sizeof(buf))) { + if (rslt >= sizeof(buf)) { return ""; } buf[rslt] = '\0'; @@ -81,7 +81,7 @@ std::string GetFullPath(std::string path) long WriteFunc(WriterStruct* writer, const void* data, size_t size) { - if (writer == nullptr || data == nullptr || size <= 0) { + if (writer == nullptr || data == nullptr || size == 0) { return -1; } diff --git a/device/plugins/hidump_plugin/test/unittest/hidump_plugin_unittest.cpp b/device/plugins/hidump_plugin/test/unittest/hidump_plugin_unittest.cpp index 27d1743bf..47cefdc69 100644 --- a/device/plugins/hidump_plugin/test/unittest/hidump_plugin_unittest.cpp +++ b/device/plugins/hidump_plugin/test/unittest/hidump_plugin_unittest.cpp @@ -42,7 +42,7 @@ public: long WriteFunc(WriterStruct* writer, const void* data, size_t size) { - if (writer == nullptr || data == nullptr || size <= 0) { + if (writer == nullptr || data == nullptr || size == 0) { return -1; } diff --git a/device/plugins/hilog_plugin/test/unittest/hilog_plugin_unittest.cpp b/device/plugins/hilog_plugin/test/unittest/hilog_plugin_unittest.cpp index 2414af336..04a97a255 100644 --- a/device/plugins/hilog_plugin/test/unittest/hilog_plugin_unittest.cpp +++ b/device/plugins/hilog_plugin/test/unittest/hilog_plugin_unittest.cpp @@ -49,7 +49,7 @@ public: long WriteFunc(WriterStruct* writer, const void* data, size_t size) { - if (writer == nullptr || data == nullptr || size <= 0) { + if (writer == nullptr || data == nullptr || size == 0) { return -1; } diff --git a/device/plugins/hiperf_plugin/test/unittest/hiperf_plugin_unittest.cpp b/device/plugins/hiperf_plugin/test/unittest/hiperf_plugin_unittest.cpp index 6073ad3ed..61a70e00a 100644 --- a/device/plugins/hiperf_plugin/test/unittest/hiperf_plugin_unittest.cpp +++ b/device/plugins/hiperf_plugin/test/unittest/hiperf_plugin_unittest.cpp @@ -44,7 +44,7 @@ public: long WriteFunc(WriterStruct* writer, const void* data, size_t size) { - if (writer == nullptr || data == nullptr || size <= 0) { + if (writer == nullptr || data == nullptr || size == 0) { return -1; } diff --git a/device/plugins/hisysevent_plugin/test/unittest/hisysevent_plugin_unittest.cpp b/device/plugins/hisysevent_plugin/test/unittest/hisysevent_plugin_unittest.cpp index 8748ce9a9..f649dc46a 100644 --- a/device/plugins/hisysevent_plugin/test/unittest/hisysevent_plugin_unittest.cpp +++ b/device/plugins/hisysevent_plugin/test/unittest/hisysevent_plugin_unittest.cpp @@ -45,7 +45,7 @@ public: long WriteFunc(WriterStruct* writer, const void* data, size_t size) { - if (writer == nullptr || data == nullptr || size <= 0) { + if (writer == nullptr || data == nullptr || size == 0) { return -1; } diff --git a/device/plugins/memory_plugin/test/unittest/memory_data_plugin_unittest.cpp b/device/plugins/memory_plugin/test/unittest/memory_data_plugin_unittest.cpp index 4118f230c..9952901b9 100644 --- a/device/plugins/memory_plugin/test/unittest/memory_data_plugin_unittest.cpp +++ b/device/plugins/memory_plugin/test/unittest/memory_data_plugin_unittest.cpp @@ -343,7 +343,7 @@ string Getexepath() char buf[PATH_MAX] = ""; std::string path = "/proc/self/exe"; size_t rslt = readlink(path.c_str(), buf, sizeof(buf)); - if (rslt < 0 || (rslt >= sizeof(buf))) { + if (rslt >= sizeof(buf)) { return ""; } buf[rslt] = '\0'; @@ -756,7 +756,7 @@ HWTEST_F(MemoryDataPluginTest, TestpluginMemoryService, TestSize.Level1) long WriteFunc(WriterStruct* writer, const void* data, size_t size) { - if (writer == nullptr || data == nullptr || size <= 0) { + if (writer == nullptr || data == nullptr || size == 0) { return -1; } return 0; diff --git a/device/plugins/network_plugin/test/unittest/network_plugin_test.cpp b/device/plugins/network_plugin/test/unittest/network_plugin_test.cpp index 0350c2782..ed08ee54d 100644 --- a/device/plugins/network_plugin/test/unittest/network_plugin_test.cpp +++ b/device/plugins/network_plugin/test/unittest/network_plugin_test.cpp @@ -68,7 +68,7 @@ string Getexepath() char buf[PATH_MAX] = ""; std::string path = "/proc/self/exe"; size_t rslt = readlink(path.c_str(), buf, sizeof(buf)); - if (rslt < 0 || (rslt >= sizeof(buf))) { + if (rslt >= sizeof(buf)) { return ""; } buf[rslt] = '\0'; @@ -225,7 +225,7 @@ HWTEST_F(NetworkPluginTest, TestParseFromArrayOfPluginStart, TestSize.Level1) long WriteFunc(WriterStruct* writer, const void* data, size_t size) { - if (writer == nullptr || data == nullptr || size <= 0) { + if (writer == nullptr || data == nullptr || size == 0) { return -1; } return 0; diff --git a/device/plugins/process_plugin/test/unittest/process_plugin_unittest.cpp b/device/plugins/process_plugin/test/unittest/process_plugin_unittest.cpp index 6ccdf0186..913c07645 100644 --- a/device/plugins/process_plugin/test/unittest/process_plugin_unittest.cpp +++ b/device/plugins/process_plugin/test/unittest/process_plugin_unittest.cpp @@ -101,7 +101,7 @@ string Getexepath() char buf[PATH_MAX] = ""; std::string path = "/proc/self/exe"; size_t rslt = readlink(path.c_str(), buf, sizeof(buf)); - if (rslt < 0 || (rslt >= sizeof(buf))) { + if (rslt >= sizeof(buf)) { return ""; } buf[rslt] = '\0'; diff --git a/device/plugins/xpower_plugin/test/unittest/xpower_plugin_unittest.cpp b/device/plugins/xpower_plugin/test/unittest/xpower_plugin_unittest.cpp index 53dff7255..4ffe772cf 100644 --- a/device/plugins/xpower_plugin/test/unittest/xpower_plugin_unittest.cpp +++ b/device/plugins/xpower_plugin/test/unittest/xpower_plugin_unittest.cpp @@ -35,7 +35,7 @@ const int DEFAULT_WAIT = 9; std::vector g_protoXpower; long WriteFunc(WriterStruct* writer, const void* data, size_t size) { - if (writer == nullptr || data == nullptr || size <= 0) { + if (writer == nullptr || data == nullptr || size == 0) { return -1; } -- Gitee