diff --git a/services/param/manager/param_utils.c b/services/param/manager/param_utils.c index 4b41c4e2669f291052e28b054959b1510696a28c..ee0dadf7b08ac19bb21d3cbb12ee9e9a4dc6d1c6 100755 --- a/services/param/manager/param_utils.c +++ b/services/param/manager/param_utils.c @@ -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); diff --git a/services/param/trigger/trigger_manager.c b/services/param/trigger/trigger_manager.c index 6e025d4c07f87d0b2b223b40e3e089e1c6172c0c..97e46398d3c3ade312d0c8c623fe417fd155eb8b 100644 --- a/services/param/trigger/trigger_manager.c +++ b/services/param/trigger/trigger_manager.c @@ -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; } diff --git a/services/src/init_cmds.c b/services/src/init_cmds.c index 264ad6d81a1ec986783edc1ed0f3b244c91d2ba3..81b40970a2bb0867175c889626f61c9a549830af 100644 --- a/services/src/init_cmds.c +++ b/services/src/init_cmds.c @@ -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"); diff --git a/ueventd/ueventd_read_cfg.c b/ueventd/ueventd_read_cfg.c index be11185b8e484a7f0d976bc52d5f647863a6b187..9694dfcae595a69611d75d0e9a27b415344f27b7 100755 --- a/ueventd/ueventd_read_cfg.c +++ b/ueventd/ueventd_read_cfg.c @@ -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};