修改检视意见

Signed-off-by: Nxlei1030 <xionglei6@huawei.com>

services/param/include/param_service.h

@@ -39,8 +39,6 @@ typedef struct cmdLineInfo {
 } cmdLineInfo;
 
 int WriteParam(const WorkSpace *workSpace, const char *name, const char *value, uint32_t *dataIndex, int onlyAdd);
-int CommonDealFun(const char* name, const char* value, int);
-int SnDealFun(const char* name, const char* value, int);
 
 int InitPersistParamWorkSpace(const ParamWorkSpace *workSpace);
 void ClosePersistParamWorkSpace(void);

services/param/service/param_service.c

@@ -596,51 +596,7 @@ static int GetParamValueFromBuffer(const char *name, const char *buffer, char *v
     return ret;
 }
 
-static int LoadParamFromCmdLine(void)
-{
-    int ret;
-    static const cmdLineInfo cmdLines[] = {
-        {OHOS_BOOT"hardware", CommonDealFun},
-        {OHOS_BOOT"bootgroup", CommonDealFun},
-        {OHOS_BOOT"reboot_reason", CommonDealFun},
-        {OHOS_BOOT"sn", SnDealFun},
-#ifdef STARTUP_INIT_TEST
-        {OHOS_BOOT"mem", CommonDealFun},
-        {OHOS_BOOT"console", CommonDealFun},
-        {OHOS_BOOT"mmz", CommonDealFun},
-        {OHOS_BOOT"androidboot.selinux", CommonDealFun},
-        {OHOS_BOOT"init", CommonDealFun},
-        {OHOS_BOOT"root", CommonDealFun},
-        {OHOS_BOOT"uuid", CommonDealFun},
-        {OHOS_BOOT"rootfstype", CommonDealFun},
-        {OHOS_BOOT"blkdevparts", CommonDealFun}
-#endif
-    };
-    char *data = ReadFileData(PARAM_CMD_LINE);
-    PARAM_CHECK(data != NULL, return -1, "Failed to read file %s", PARAM_CMD_LINE);
-    char *value = calloc(1, PARAM_CONST_VALUE_LEN_MAX + 1);
-    PARAM_CHECK(value != NULL, free(data);
-        return -1, "Failed to read file %s", PARAM_CMD_LINE);
-
-    for (size_t i = 0; i < ARRAY_LENGTH(cmdLines); i++) {
-#ifdef BOOT_EXTENDED_CMDLINE
-        ret = GetParamValueFromBuffer(cmdLines[i].name, BOOT_EXTENDED_CMDLINE, value, PARAM_CONST_VALUE_LEN_MAX);
-        if (ret != 0) {
-            ret = GetParamValueFromBuffer(cmdLines[i].name, data, value, PARAM_CONST_VALUE_LEN_MAX);
-        }
-#else
-        ret = GetParamValueFromBuffer(cmdLines[i].name, data, value, PARAM_CONST_VALUE_LEN_MAX);
-#endif
-
-        cmdLines[i].processor(cmdLines[i].name, value, ret);
-    }
-    PARAM_LOGV("Parse cmdline finish %s", PARAM_CMD_LINE);
-    free(data);
-    free(value);
-    return 0;
-}
-
-int CommonDealFun(const char* name, const char* value, int res)
+static int CommonDealFun(const char* name, const char* value, int res)
 {
     PARAM_LOGI("Add param from cmdline %s %s", name, value);
     int ret = 0;
@@ -656,7 +612,7 @@ int CommonDealFun(const char* name, const char* value, int res)
     return ret;
 }
 
-int SnDealFun(const char* name, const char* value, int res)
+static int SnDealFun(const char* name, const char* value, int res)
 {
     PARAM_LOGI("Add SN param from cmdline %s %s", name, value);
     int ret = CheckParamName(name, 0);
@@ -692,11 +648,56 @@ int SnDealFun(const char* name, const char* value, int res)
     data[index] = '\0';
     PARAM_LOGV("**** name %s, value %s", name, data);
     ret = WriteParam(&g_paramWorkSpace.paramSpace, name, data, NULL, 0);
-    PARAM_CHECK(ret == 0, return ret, "Failed to write param %s %s", name, data);
+    PARAM_CHECK(ret == 0, free(data); return ret, "Failed to write param %s %s", name, data);
+    free(data);
 
     return ret;
 }
 
+static int LoadParamFromCmdLine(void)
+{
+    int ret;
+    static const cmdLineInfo cmdLines[] = {
+        {OHOS_BOOT"hardware", CommonDealFun},
+        {OHOS_BOOT"bootgroup", CommonDealFun},
+        {OHOS_BOOT"reboot_reason", CommonDealFun},
+        {OHOS_BOOT"sn", SnDealFun},
+#ifdef STARTUP_INIT_TEST
+        {OHOS_BOOT"mem", CommonDealFun},
+        {OHOS_BOOT"console", CommonDealFun},
+        {OHOS_BOOT"mmz", CommonDealFun},
+        {OHOS_BOOT"androidboot.selinux", CommonDealFun},
+        {OHOS_BOOT"init", CommonDealFun},
+        {OHOS_BOOT"root", CommonDealFun},
+        {OHOS_BOOT"uuid", CommonDealFun},
+        {OHOS_BOOT"rootfstype", CommonDealFun},
+        {OHOS_BOOT"blkdevparts", CommonDealFun}
+#endif
+    };
+    char *data = ReadFileData(PARAM_CMD_LINE);
+    PARAM_CHECK(data != NULL, return -1, "Failed to read file %s", PARAM_CMD_LINE);
+    char *value = calloc(1, PARAM_CONST_VALUE_LEN_MAX + 1);
+    PARAM_CHECK(value != NULL, free(data);
+        return -1, "Failed to read file %s", PARAM_CMD_LINE);
+
+    for (size_t i = 0; i < ARRAY_LENGTH(cmdLines); i++) {
+#ifdef BOOT_EXTENDED_CMDLINE
+        ret = GetParamValueFromBuffer(cmdLines[i].name, BOOT_EXTENDED_CMDLINE, value, PARAM_CONST_VALUE_LEN_MAX);
+        if (ret != 0) {
+            ret = GetParamValueFromBuffer(cmdLines[i].name, data, value, PARAM_CONST_VALUE_LEN_MAX);
+        }
+#else
+        ret = GetParamValueFromBuffer(cmdLines[i].name, data, value, PARAM_CONST_VALUE_LEN_MAX);
+#endif
+
+        cmdLines[i].processor(cmdLines[i].name, value, ret);
+    }
+    PARAM_LOGV("Parse cmdline finish %s", PARAM_CMD_LINE);
+    free(data);
+    free(value);
+    return 0;
+}
+
 int SystemWriteParam(const char *name, const char *value)
 {
     PARAM_CHECK(name != NULL && value != NULL, return -1, "The name is null");