提交 2e42812b 编写于 作者: O openharmony_ci 提交者: Gitee

!141 fix: codedex

Merge pull request !141 from 熊磊/init1014
......@@ -86,7 +86,7 @@ char *ReadFileData(const char *fileName)
char *buffer = NULL;
int fd = -1;
do {
fd = open(fileName, O_RDONLY); // 阶段早,不能使用realpath
fd = open(fileName, O_RDONLY);
PARAM_CHECK(fd >= 0, break, "Failed to read file %s", fileName);
buffer = (char *)malloc(MAX_DATA_BUFFER);
......
......@@ -44,14 +44,15 @@ int AddCommand(TriggerNode *trigger, uint32_t cmdKeyIndex, const char *content)
int ret = memcpy_s(node->content, size, content, strlen(content));
node->content[strlen(content)] = '\0';
PARAM_CHECK(ret == EOK, free(node);
return 0, "Failed to copy command");
return -1, "Failed to copy command");
}
// 插入队列
if (trigger->firstCmd == NULL) {
trigger->firstCmd = node;
trigger->lastCmd = node;
} else {
PARAM_CHECK(trigger->lastCmd != NULL, return 0, "Invalid last cmd");
PARAM_CHECK(trigger->lastCmd != NULL, free(node);
return -1, "Invalid last cmd");
trigger->lastCmd->next = node;
trigger->lastCmd = node;
}
......
......@@ -214,11 +214,10 @@ void FreeCmd(struct CmdArgs *cmd)
}
INIT_CHECK(cmd->argv == NULL, free(cmd->argv));
free(cmd);
cmd = NULL;
return;
}
static void WriteCommon(const char *file, char *buffer, int flags, mode_t mode)
static void WriteCommon(const char *file, const char *buffer, int flags, mode_t mode)
{
if (file == NULL || *file == '\0' || buffer == NULL || *buffer == '\0') {
INIT_LOGE("Invalid arugment");
......
......@@ -417,7 +417,6 @@ void ChangeSysAttributePermissions(const char *sysPath)
}
if (matched == 0) {
INIT_LOGE("Failed match syspath %s.", sysPath);
return;
}
char sysAttr[SYSPATH_SIZE] = {0};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册