diff --git a/device/base/test/unittest/common_test.cpp b/device/base/test/unittest/common_test.cpp index d8b13e44b8dde1dd81fb3600d6e9e592e5591a8d..fbe2c50214beaa8b06b066421f43adb5f5600b30 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 e2ae0d1386bb235c858643b59120ed2e63844b47..322b69b49822d14b9cf1d69de47c2d7a526636c8 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 e9f3c3ce5dd1e638cf81ff26d7434fda66460eb8..46791a23996df46162a179dfab783a8bcfff87eb 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 02f78f1e86ef4cf5f67e7fc875c84712c12e25a8..c637e8dd5f4a87b2fa4b093c832aa375870b0f85 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 160aaa33fce05b43a154ce5ccba26141c70a3feb..dcefabc9eb35ddc8570c7c7f03a4f1319fe22b71 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 433571ae4acb4bc654597027d740263a0f8ded12..fe115eafd6808a71075c0d3df9c822cd693a8399 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 ef8b0ff78b79c88637492de8e1d329abdac65222..b0f28f64247ddf6848baf01a7b0562a12c08cd45 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 f883a8a813728bae66d3ad8785624cdb41a5696a..d72cd7ea22c45e37fc9ed1b813e010e4f268d937 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 27d1743bf5b20e50676568c6b64a7c8e5b67bdbc..47cefdc69d1f3e8408bec696f15424656ece3dc6 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 2414af336f86388ed0aec714c4d6539c1bfc1c32..04a97a255ddc080fcd131451aac0337368424fcc 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 6073ad3edd0507f6ff90328b827e4044ddc6c1d2..61a70e00a5126c15f7814127cd103b27a57c4ac5 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 8748ce9a9e6d719ac0f4468406fc0aa96c772f39..f649dc46a13a2e12d6f8da4b3a9389717db33f2e 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 4118f230c36b880737b31b878c1cc2076292bc77..9952901b98935494ba4653cf68cc86343f93ee4b 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 0350c278280766643fe0c516c66996ed363808d4..ed08ee54d2fe62deded12aca312a5e5cffc48e68 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 6ccdf01869bd4139fd360c9349a62cd5102ce82e..913c076452b0cc4f8e4aebbb4311ce03eaeb925f 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 53dff725595e8f38ba0075ea61e9ef2ca473a683..4ffe772cf6c210dc636d0f48502fb1bdbb3d1690 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; }