diff --git a/include/syscap_tool.h b/include/syscap_tool.h index 8ec1899ac0d42cb2acda526296f77a29f3e0d683..d485c9bf085cdf120322a52ebadd506aa436fcce 100644 --- a/include/syscap_tool.h +++ b/include/syscap_tool.h @@ -16,7 +16,7 @@ #ifndef _SYSCAP_TOOL_H #define _SYSCAP_TOOL_H -#include "stdint.h" +#include #define TYPE_FILE (0U) #define TYPE_STRING (1U) diff --git a/interfaces/inner_api/syscap_interface.c b/interfaces/inner_api/syscap_interface.c index a42a7a5965ff8f02a8602da85572157527f4c634..14082ca3537829bbcfa0be1c4b6c8bf062616c98 100644 --- a/interfaces/inner_api/syscap_interface.c +++ b/interfaces/inner_api/syscap_interface.c @@ -13,10 +13,8 @@ * limitations under the License. */ +#include #include -#include -#include -#include #include #include #include diff --git a/napi/napi_query_syscap.cpp b/napi/napi_query_syscap.cpp index 09dc080241a6d1370efa7c3bac5ef3eba36d2ed4..5cbb3d9f0aefbc0ac19fe73b6c3fa7691c3676bd 100644 --- a/napi/napi_query_syscap.cpp +++ b/napi/napi_query_syscap.cpp @@ -13,11 +13,10 @@ * limitations under the License. */ +#include #include -#include +#include #include -#include -#include "hilog/log.h" #include "napi/native_api.h" #include "napi/native_node_api.h" #include "syscap_interface.h" diff --git a/src/create_pcid.c b/src/create_pcid.c index 8710a952b7a6e35ae8589625f4fab03591dbe05a..7926f933d6d1b4a5c5ef2f5ad2b11f285ea55868 100644 --- a/src/create_pcid.c +++ b/src/create_pcid.c @@ -17,12 +17,8 @@ #include #include #include -#include #include #include -#include -#include -#include #include #include "securec.h" #include "cJSON.h" diff --git a/src/endian_internal.c b/src/endian_internal.c index fc7301aeb388f0e820fcd97ab18aa714e063de99..5da4f705b27539ec6f7df64c36df1137cb45f0eb 100644 --- a/src/endian_internal.c +++ b/src/endian_internal.c @@ -14,7 +14,6 @@ */ #include "endian_internal.h" -#include #define B_L_SWAP16(A) ((((uint16_t)(A) & 0xff00) >> 8) | (((uint16_t)(A) & 0x00ff) << 8)) #define B_L_SWAP32(A) ((((uint32_t)(A) & 0xff000000) >> 24) | (((uint32_t)(A) & 0x00ff0000) >> 8) | \ diff --git a/src/syscap_tool.c b/src/syscap_tool.c index fdfceb22d8799485d53eeca84bcd5981e0f501d9..8f28bba68b3ba687f6d880a4a4e310dca8df97c5 100644 --- a/src/syscap_tool.c +++ b/src/syscap_tool.c @@ -14,15 +14,11 @@ */ #include -#include #include #include #include -#include #include #include -#include -#include #include #include "securec.h" #include "endian_internal.h" diff --git a/test/unittest/common/include/syscap_codec_test.h b/test/unittest/common/include/syscap_codec_test.h index 6c53be637af281f90088abb548f6890076019d40..2410fa188c87f9500ed56dc7bd416b004b617ade 100644 --- a/test/unittest/common/include/syscap_codec_test.h +++ b/test/unittest/common/include/syscap_codec_test.h @@ -16,8 +16,6 @@ #ifndef _SYSCAP_CODEC_TEST_H #define _SYSCAP_CODEC_TEST_H -#include - #ifdef __cplusplus #if __cplusplus extern "C" { diff --git a/test/unittest/common/syscap_codec_test.cpp b/test/unittest/common/syscap_codec_test.cpp index be73036c9860d39c29334a6158ea64ea1ebb18ef..23df011358bef270f0b31b115134874b5986adce 100644 --- a/test/unittest/common/syscap_codec_test.cpp +++ b/test/unittest/common/syscap_codec_test.cpp @@ -13,7 +13,8 @@ * limitations under the License. */ -#include +#include +#include #include "syscap_interface.h" #include "syscap_codec_test.h" @@ -45,7 +46,7 @@ HWTEST_F(SyscapCodecTest, EncodeOsSyscap, TestSize.Level1) */ HWTEST_F(SyscapCodecTest, EncodePrivateSyscap, TestSize.Level1) { - char *charPriInput = NULL; + char *charPriInput = nullptr; int priOutLen; EXPECT_TRUE(EncodePrivateSyscap(&charPriInput, &priOutLen)); free(charPriInput); @@ -59,7 +60,7 @@ HWTEST_F(SyscapCodecTest, EncodePrivateSyscap, TestSize.Level1) HWTEST_F(SyscapCodecTest, DecodeOsSyscap, TestSize.Level1) { int osSyscap[32] = {1, 3, 3}; - char (*osOutput)[SINGLE_SYSCAP_LEN] = NULL; + char (*osOutput)[SINGLE_SYSCAP_LEN] = nullptr; int decodeOsCnt; char expectOsOutput001[] = "SystemCapability.Account.AppAccount"; char expectOsOutput002[] = "SystemCapability.Account.OsAccount"; @@ -78,7 +79,7 @@ HWTEST_F(SyscapCodecTest, DecodeOsSyscap, TestSize.Level1) */ HWTEST_F(SyscapCodecTest, DecodePrivateSyscap, TestSize.Level1) { - char (*priOutput)[SINGLE_SYSCAP_LEN] = NULL; + char (*priOutput)[SINGLE_SYSCAP_LEN] = nullptr; char priSyscap[] = "Device.syscap1GEDR,Device.syscap2WREGW,Vendor.syscap3RGD,Vendor.syscap4RWEG,Vendor.syscap5REWGWE,"; int decodePriCnt; char expectPriOutput001[] = "SystemCapability.Device.syscap1GEDR"; @@ -104,15 +105,15 @@ HWTEST_F(SyscapCodecTest, DecodePrivateSyscap, TestSize.Level1) */ HWTEST_F(SyscapCodecTest, DecodePrivateSyscap1, TestSize.Level1) { - char *charPriInput = NULL; - char (*priOutput)[SINGLE_SYSCAP_LEN] = NULL; + char *charPriInput = nullptr; + char (*priOutput)[SINGLE_SYSCAP_LEN] = nullptr; int priOutLen; int decodePriCnt; EXPECT_TRUE(EncodePrivateSyscap(&charPriInput, &priOutLen)); if (priOutLen == 0) { EXPECT_TRUE(DecodePrivateSyscap(charPriInput, &priOutput, &decodePriCnt)); - EXPECT_EQ((void *)priOutput, (void *)NULL); + EXPECT_EQ((void *)priOutput, (void *)nullptr); EXPECT_EQ(decodePriCnt, 0); free(priOutput); } @@ -148,7 +149,7 @@ HWTEST_F(SyscapCodecTest, ComparePcidString, TestSize.Level1) EXPECT_EQ(result.targetApiVersion, 0); EXPECT_EQ(result.missSyscapNum, 0); for (int i = 0; i < MAX_MISS_SYSCAP; i++) { - EXPECT_EQ((void *)result.syscap[i], (void *)NULL); + EXPECT_EQ((void *)result.syscap[i], (void *)nullptr); } } } // namespace Syscap