openharmony/developtools_syscap_codec
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_syscap_codec.git synced 2026-08-27 10:21:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

modify for codex check.

Browse Source 
Signed-off-by: yudechen <chenyude@huawei.com>
Change-Id: I85252fc1e17387a67f2cf4a17771102752a66c53
This commit is contained in:
yudechen
2022-05-20 15:45:33 +08:00
parent d485af0fc1
commit 35e77d673e
5 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/syscap_define.h
+1
View File
@@ -161,6 +161,7 @@ typedef enum SystemCapabilityNum {
USERIAM_USERAUTH_FACEAUTH,
USERIAM_USERAUTH_PINAUTH,
USERIAM_USERIDM,
SYSCAP_NUM_MAX = 960
} SyscapNum;
/* sort by enum */
interfaces/inner_api/syscap_interface.c
+2 -2
View File
@@ -70,8 +70,8 @@ static int32_t GetFileContext(char **contextBufPtr, uint32_t *bufferLen)
FreeContextBuffer(contextBuffer);
return -1;
}
ret = fread(contextBuffer, statBuf.st_size, 1, fp);
if (ret != 1) {
size_t retFread = fread(contextBuffer, statBuf.st_size, 1, fp);
if (retFread != 1) {
PRINT_ERR("read file(%s) failed, errno = %d\n", inputFile, errno);
FreeContextBuffer(contextBuffer);
(void)fclose(fp);
napi/query_syscap.js
+1 -1
View File
@@ -1,7 +1,7 @@
// 首先需要通过requireInternal函数加载本模块
const systemCapability = requireInternal('systemCapability');
// 这里定义了calc模块对外暴露的所有api
// 这里定义了模块对外暴露的所有api
export default {
querySystemCapabilities: systemCapability.querySystemCapabilities
}
src/create_pcid.c
+10 -9
View File
@@ -88,8 +88,8 @@ static int32_t GetFileContext(char *inputFile, char **contextBufPtr, uint32_t *c
FreeContextBuffer(contextBuffer);
return -1;
}
ret = fread(contextBuffer, statBuf.st_size, 1, fp);
if (ret != 1) {
size_t retFread = fread(contextBuffer, statBuf.st_size, 1, fp);
if (retFread != 1) {
PRINT_ERR("read file(%s) failed, errno = %d\n", path, errno);
FreeContextBuffer(contextBuffer);
(void)fclose(fp);
@@ -195,23 +195,24 @@ int32_t CreatePCID(char *inputFile, char *outDirPath)
jsonSyscapObj = cJSON_GetObjectItem(jsonRootObj, "syscap");
if (jsonSyscapObj == NULL || !cJSON_IsObject(jsonSyscapObj)) {
PRINT_ERR("get \"syscap\" object failed, jsonSyscapObj = %p\n", jsonSyscapObj);
PRINT_ERR("get \"syscap\" object failed\n");
ret = -1;
goto FREE_CONVERT_OUT;
}
jsonOsSyscapObj = cJSON_GetObjectItem(jsonSyscapObj, "os");
if (jsonOsSyscapObj == NULL || !cJSON_IsArray(jsonOsSyscapObj)) {
PRINT_ERR("get \"os\" array failed, jsonOsSyscapObj = %p\n", jsonOsSyscapObj);
PRINT_ERR("get \"os\" array failed\n");
ret = -1;
goto FREE_CONVERT_OUT;
}
osCapSize = cJSON_GetArraySize(jsonOsSyscapObj);
if (osCapSize < 0) {
ret = cJSON_GetArraySize(jsonOsSyscapObj);
if (ret < 0) {
PRINT_ERR("get \"os\" array size failed\n");
ret = -1;
goto FREE_CONVERT_OUT;
}
osCapSize = (uint32_t)ret;
jsonPriSyscapObj = cJSON_GetObjectItem(jsonSyscapObj, "private");
if (jsonPriSyscapObj != NULL && cJSON_IsArray(jsonPriSyscapObj)) {
@@ -219,7 +220,7 @@ int32_t CreatePCID(char *inputFile, char *outDirPath)
} else if (jsonPriSyscapObj == NULL) {
privateCapSize = 0;
} else {
PRINT_ERR("get \"private\" array failed, jsonPriSyscapObj = %p\n", jsonPriSyscapObj);
PRINT_ERR("get \"private\" array failed\n");
ret = -1;
goto FREE_CONVERT_OUT;
}
@@ -281,7 +282,7 @@ int32_t CreatePCID(char *inputFile, char *outDirPath)
jsonSyscapObj = cJSON_GetObjectItem(jsonRootObj, "api_version");
if (jsonSyscapObj == NULL || !cJSON_IsNumber(jsonSyscapObj)) {
PRINT_ERR("get \"api_version\" failed, jsonSyscapObj = %p\n", jsonSyscapObj);
PRINT_ERR("get \"api_version\" failed\n");
ret = -1;
goto FREE_PCID_BUFFER_OUT;
}
@@ -306,7 +307,7 @@ int32_t CreatePCID(char *inputFile, char *outDirPath)
jsonSyscapObj = cJSON_GetObjectItem(jsonRootObj, "manufacturer_id");
if (jsonSyscapObj == NULL || !cJSON_IsNumber(jsonSyscapObj)) {
PRINT_ERR("get \"manufacturer_id\" failed, jsonSyscapObj = %p\n", jsonSyscapObj);
PRINT_ERR("get \"manufacturer_id\" failed\n");
ret = -1;
goto FREE_PCID_BUFFER_OUT;
}
src/syscap_tool.c
+13 -12
View File
@@ -94,8 +94,8 @@ static int32_t GetFileContext(char *inputFile, char **contextBufPtr, uint32_t *b
FreeContextBuffer(contextBuffer);
return -1;
}
ret = fread(contextBuffer, statBuf.st_size, 1, fp);
if (ret != 1) {
size_t retFread = fread(contextBuffer, statBuf.st_size, 1, fp);
if (retFread != 1) {
PRINT_ERR("read file(%s) failed, errno = %d\n", path, errno);
FreeContextBuffer(contextBuffer);
(void)fclose(fp);
@@ -193,36 +193,37 @@ int32_t PCIDEncode(char *inputFile, char *outDirPath)
cjsonObjectPtr = cJSON_GetObjectItem(cjsonObjectRoot, "syscap");
if (cjsonObjectPtr == NULL || !cJSON_IsObject(cjsonObjectPtr)) {
PRINT_ERR("get \"syscap\" object failed, cjsonObjectPtr = %p\n", cjsonObjectPtr);
PRINT_ERR("get \"syscap\" object failed\n");
ret = -1;
goto FREE_CONTEXT_OUT;
}
osCapPtr = cJSON_GetObjectItem(cjsonObjectPtr, "os");
if (osCapPtr == NULL || !cJSON_IsArray(osCapPtr)) {
PRINT_ERR("get \"os\" array failed, osCapPtr = %p\n", osCapPtr);
PRINT_ERR("get \"os\" array failed\n");
ret = -1;
goto FREE_CONTEXT_OUT;
}
osCapSize = cJSON_GetArraySize(osCapPtr);
if (osCapSize < 0) {
ret = cJSON_GetArraySize(osCapPtr);
if (ret < 0) {
PRINT_ERR("get \"os\" array size failed\n");
ret = -1;
goto FREE_CONTEXT_OUT;
}
osCapSize = (uint32_t)ret;
// 2, to save osSysCaptype & osSysCapLength
convertedBufLen += (2 * sizeof(uint16_t) + osCapSize * SINGLE_FEAT_LENGTH);
privateCapPtr = cJSON_GetObjectItem(cjsonObjectPtr, "private");
if (privateCapPtr != NULL && cJSON_IsArray(privateCapPtr)) {
privateCapSize = cJSON_GetArraySize(privateCapPtr);
privateCapSize = (uint32_t)cJSON_GetArraySize(privateCapPtr);
// 2, to save privateSysCaptype & privateSysCapLength
convertedBufLen += (2 * sizeof(uint16_t) * !!privateCapSize +
privateCapSize * SINGLE_FEAT_LENGTH);
} else if (privateCapPtr == NULL) {
privateCapSize = 0;
} else {
PRINT_ERR("get \"private\" array failed, privateCapPtr = %p\n", privateCapPtr);
PRINT_ERR("get \"private\" array failed\n");
ret = -1;
goto FREE_CONTEXT_OUT;
}
@@ -239,7 +240,7 @@ int32_t PCIDEncode(char *inputFile, char *outDirPath)
headPtr = (PCIDHead *)convertedBuffer;
cjsonObjectPtr = cJSON_GetObjectItem(cjsonObjectRoot, "api_version");
if (cjsonObjectPtr == NULL || !cJSON_IsNumber(cjsonObjectPtr)) {
PRINT_ERR("get \"api_version\" failed, cjsonObjectPtr = %p\n", cjsonObjectPtr);
PRINT_ERR("get \"api_version\" failed\n");
ret = -1;
goto FREE_CONVERT_OUT;
}
@@ -264,7 +265,7 @@ int32_t PCIDEncode(char *inputFile, char *outDirPath)
cjsonObjectPtr = cJSON_GetObjectItem(cjsonObjectRoot, "manufacturer_id");
if (cjsonObjectPtr == NULL || !cJSON_IsNumber(cjsonObjectPtr)) {
PRINT_ERR("get \"manufacturer_id\" failed, cjsonObjectPtr = %p\n", cjsonObjectPtr);
PRINT_ERR("get \"manufacturer_id\" failed\n");
ret = -1;
goto FREE_CONVERT_OUT;
}
@@ -334,7 +335,7 @@ int32_t PCIDEncode(char *inputFile, char *outDirPath)
cjsonObjectPtr = cJSON_GetObjectItem(cjsonObjectRoot, "product");
if (cjsonObjectPtr == NULL || !cJSON_IsString(cjsonObjectPtr)) {
PRINT_ERR("get \"product\" failed, cjsonObjectPtr = %p\n", cjsonObjectPtr);
PRINT_ERR("get \"product\" failed\n");
ret = -1;
goto FREE_CONVERT_OUT;
}
@@ -646,7 +647,7 @@ int32_t RPCIDEncode(char *inputFile, char *outDirPath)
headPtr = (RPCIDHead *)convertedBuffer;
apiVerItem = cJSON_GetObjectItem(cjsonObjectRoot, "api_version");
if (apiVerItem == NULL || !cJSON_IsNumber(apiVerItem)) {
PRINT_ERR("get \"api_version\" failed, apiVerItem = %p\n", apiVerItem);
PRINT_ERR("get \"api_version\" failed\n");
ret = -1;
goto FREE_CONVERT_OUT;
}