From 9188b34ce645cccba7e0aaad72ab577e7fa2ed98 Mon Sep 17 00:00:00 2001 From: yudechen Date: Fri, 19 Aug 2022 11:25:43 +0800 Subject: [PATCH 1/2] chore: conform to the code style. Signed-off-by: yudechen Change-Id: I9ccf0f56ec79f200f59a917b08d1638c75b54024 --- include/syscap_define.h | 11 ++++++++++- interfaces/inner_api/syscap_interface.c | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index 2c5f482..fa4475d 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -19,7 +19,11 @@ #include #define SINGLE_SYSCAP_LEN (256 + 17) - +#ifdef __cplusplus +#if __cplusplus +extern "C" { +#endif /* __cplusplus */ +#endif /* __cplusplus */ typedef struct SystemCapabilityWithNum { char str[SINGLE_SYSCAP_LEN]; uint16_t num; @@ -401,4 +405,9 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Utils.Lang", UTILS_LANG}, }; +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ #endif // _SYSCAP_DEFINE_H diff --git a/interfaces/inner_api/syscap_interface.c b/interfaces/inner_api/syscap_interface.c index b55f356..6010d1f 100644 --- a/interfaces/inner_api/syscap_interface.c +++ b/interfaces/inner_api/syscap_interface.c @@ -183,7 +183,7 @@ bool EncodePrivateSyscap(char **output, int *outputLen) } FreeContextBuffer(contextBuffer); - *outputLen = strlen(outputStr); + *outputLen = (int)strlen(outputStr); *output = outputStr; return true; } From 6fa113c1c08cef43de7a06e8e8bd4a5e50a0c6e3 Mon Sep 17 00:00:00 2001 From: yudechen Date: Fri, 19 Aug 2022 14:46:30 +0800 Subject: [PATCH 2/2] chore: modify comment of syscap_define.h. Signed-off-by: yudechen Change-Id: Ifd139687e731d38b2cbf0ec6446a1bd0d6dc3e95 --- include/syscap_define.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index fa4475d..1c0775e 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -30,7 +30,7 @@ typedef struct SystemCapabilityWithNum { } SyscapWithNum; /* - * New syscap index must be added last and + * New SyscapNum must be added last and * don't delete anyone, just comment after it. */ typedef enum SystemCapabilityNum { @@ -220,7 +220,7 @@ typedef enum SystemCapabilityNum { } SyscapNum; -/* sort by enum */ +/* Sort by SyscapNum */ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Account.AppAccount", ACCOUNT_APPACCOUNT}, {"SystemCapability.Account.OsAccount", ACCOUNT_OSACCOUNT},