fix: kora工具检视问题修复
【背景】kora工具检视问题修复 【修改方案】 1,对部分代码问题进行整改 【影响】 对现有的产品编译不会有影响。 Signed-off-by: wangchen <wangchen64@huawei.com> Change-Id: Iafc58b7c71e5d139e11a0ae9d98ca5a57fc6549f
This commit is contained in:
@@ -55,14 +55,15 @@ INT32 OsMountPatchFs(VOID)
|
||||
}
|
||||
partInfo.fsType = strdup(FS_TYPE);
|
||||
if (partInfo.fsType == NULL) {
|
||||
return LOS_NOK;
|
||||
ret = LOS_NOK;
|
||||
goto EXIT;
|
||||
}
|
||||
partInfo.startAddr = PATCHFS_FLASH_ADDR;
|
||||
partInfo.partSize = PATCHFS_FLASH_SIZE;
|
||||
#else
|
||||
ret = GetPartitionInfo(&partInfo);
|
||||
if (ret != LOS_OK) {
|
||||
return ret;
|
||||
goto EXIT;
|
||||
}
|
||||
partInfo.startAddr = (partInfo.startAddr >= 0) ? partInfo.startAddr : PATCHFS_FLASH_ADDR;
|
||||
partInfo.partSize = (partInfo.partSize >= 0) ? partInfo.partSize : PATCHFS_FLASH_SIZE;
|
||||
@@ -71,7 +72,7 @@ INT32 OsMountPatchFs(VOID)
|
||||
ret = LOS_NOK;
|
||||
partInfo.devName = strdup(PATCH_FLASH_DEV_NAME);
|
||||
if (partInfo.devName == NULL) {
|
||||
return LOS_NOK;
|
||||
goto EXIT;
|
||||
}
|
||||
const CHAR *devName = GetDevNameOfPartition(&partInfo);
|
||||
if (devName != NULL) {
|
||||
@@ -92,9 +93,13 @@ INT32 OsMountPatchFs(VOID)
|
||||
ResetDevNameofPartition(&partInfo);
|
||||
}
|
||||
|
||||
EXIT:
|
||||
free(partInfo.devName);
|
||||
partInfo.devName = NULL;
|
||||
free(partInfo.storageType);
|
||||
partInfo.storageType = NULL;
|
||||
free(partInfo.fsType);
|
||||
partInfo.fsType = NULL;
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -214,7 +214,7 @@ UINT64 LOS_SizeStrToNum(CHAR *value)
|
||||
UINT64 num = 0;
|
||||
|
||||
/* If the string is a hexadecimal value */
|
||||
if (sscanf_s(value, "0x%x", &num) > 0) {
|
||||
if (sscanf_s(value, "0x%llx", &num) > 0) {
|
||||
value += strlen("0x");
|
||||
if (strspn(value, "0123456789abcdefABCDEF") < strlen(value)) {
|
||||
goto ERROUT;
|
||||
@@ -247,4 +247,4 @@ UINT64 LOS_SizeStrToNum(CHAR *value)
|
||||
ERROUT:
|
||||
PRINT_ERR("Invalid value string \"%s\"!\n", value);
|
||||
return num;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -327,7 +327,7 @@ STATIC INT32 CheckValidation(UINT64 rootAddr, UINT64 rootSize, UINT64 userAddr,
|
||||
|
||||
if ((rootAddr & (alignSize - 1)) || (rootSize & (alignSize - 1)) ||
|
||||
(userAddr & (alignSize - 1)) || (userSize & (alignSize - 1))) {
|
||||
PRINT_ERR("The address or size value should be 0x%x aligned!\n", alignSize);
|
||||
PRINT_ERR("The address or size value should be 0x%llx aligned!\n", alignSize);
|
||||
return LOS_NOK;
|
||||
}
|
||||
|
||||
@@ -371,4 +371,4 @@ INT32 OsMountRootfs()
|
||||
}
|
||||
|
||||
return LOS_OK;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -654,7 +654,7 @@ static int os_shell_cmd_do_cp(const char *src_filepath, const char *dst_filename
|
||||
char *dst_filepath = NULL;
|
||||
char *buf = NULL;
|
||||
const char *filename = NULL;
|
||||
size_t r_size, w_size;
|
||||
ssize_t r_size, w_size;
|
||||
int src_fd = -1;
|
||||
int dst_fd = -1;
|
||||
struct stat stat_buf;
|
||||
@@ -1391,8 +1391,8 @@ int checkNum(const char *arg)
|
||||
#ifdef LOSCFG_KERNEL_SYSCALL
|
||||
int osShellCmdSu(int argc, const char **argv)
|
||||
{
|
||||
unsigned int su_uid;
|
||||
unsigned int su_gid;
|
||||
int su_uid;
|
||||
int su_gid;
|
||||
|
||||
if (argc == 0)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user