From 697af523ee3707f332f8909180d4a82e093f6faf Mon Sep 17 00:00:00 2001
From: BianTanggui <liuzheng95@huawei.com>
Date: Tue, 22 Feb 2022 15:54:08 +0800
Subject: [PATCH] Match-id-c6cbeee5e47608c24c4301878b5f1acceddee981

---
 cli/src/cgrp.c  | 11 ++---------
 cli/src/ns.c    |  8 ++------
 cli/src/utils.c | 14 ++++----------
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/cli/src/cgrp.c b/cli/src/cgrp.c
index 29534bc..fbb059a 100644
--- a/cli/src/cgrp.c
+++ b/cli/src/cgrp.c
@@ -73,9 +73,7 @@ int ParseFileByLine(char* buffer, int bufferSize, const ParseFileLine fn, const
     char resolvedPath[PATH_MAX] = {0x0};
 
     if (realpath(filepath, resolvedPath) == NULL && errno != ENOENT) {
-        char* str = FormatLogMessage("cannot canonicalize path %s.", filepath);
-        Logger(str, LEVEL_ERROR, SCREEN_YES);
-        free(str);
+        Logger("Cannot canonicalize path.", LEVEL_ERROR, SCREEN_YES);
         return -1;
     }
     if (CheckLegality(resolvedPath) != 0) {
@@ -170,9 +168,7 @@ int SetupDeviceCgroup(FILE *cgroupAllow, const char *devName)
 
     ret = stat((const char *)devPath, &devStat);
     if (ret < 0) {
-        char* str = FormatLogMessage("failed to get stat of %s.", devPath);
-        Logger(str, LEVEL_ERROR, SCREEN_YES);
-        free(str);
+        Logger("Failed to get stat of devpath.", LEVEL_ERROR, SCREEN_YES);
         return -1;
     }
 
@@ -275,7 +271,6 @@ int SetupCgroup(const struct ParsedConfig *config)
 
     if (realpath(config->cgroupPath, resolvedCgroupPath) == NULL && errno != ENOENT) {
         Logger("cannot canonicalize cgroup.", LEVEL_ERROR, SCREEN_YES);
-        free(str);
         return -1;
     }
     if (CheckLegality(resolvedCgroupPath) != 0) {
@@ -285,7 +280,6 @@ int SetupCgroup(const struct ParsedConfig *config)
     cgroupAllow = fopen((const char *)resolvedCgroupPath, "a");
     if (cgroupAllow == NULL) {
         Logger("failed to open cgroup file.", LEVEL_ERROR, SCREEN_YES);
-        free(str);
         return -1;
     }
 
@@ -311,7 +305,6 @@ int SetupCgroup(const struct ParsedConfig *config)
         if (ret < 0) {
             fclose(cgroupAllow);
             Logger("failed to setup cgroup.", LEVEL_ERROR, SCREEN_YES);
-            free(str);
             return -1;
         }
     }
diff --git a/cli/src/ns.c b/cli/src/ns.c
index 13a3a55..df62101 100644
--- a/cli/src/ns.c
+++ b/cli/src/ns.c
@@ -44,17 +44,13 @@ int EnterNsByPath(const char *path, int nsType)
 
     fd = open(path, O_RDONLY); // proc文件接口，非外部输入
     if (fd < 0) {
-        char* str = FormatLogMessage("failed to open ns path: %s.", path);
-        Logger(str, LEVEL_ERROR, SCREEN_YES);
-        free(str);
+        Logger("Failed to open ns path.", LEVEL_ERROR, SCREEN_YES);
         return -1;
     }
 
     ret = EnterNsByFd(fd, nsType);
     if (ret < 0) {
-        char* str = FormatLogMessage("failed to set ns: %s.", path);
-        Logger(str, LEVEL_ERROR, SCREEN_YES);
-        free(str);
+        Logger("failed to set ns.", LEVEL_ERROR, SCREEN_YES);
         close(fd);
         return -1;
     }
diff --git a/cli/src/utils.c b/cli/src/utils.c
index db7b6e4..7b625e3 100644
--- a/cli/src/utils.c
+++ b/cli/src/utils.c
@@ -128,25 +128,19 @@ int MakeMountPoints(const char *path, mode_t mode)
 
     int ret = MakeDirWithParent(parentDir, DEFAULT_DIR_MODE);
     if (ret < 0) {
-        char* str = FormatLogMessage("failed to make parent dir for file: %s", path);
-        Logger(str, LEVEL_ERROR, SCREEN_YES);
-        free(str);
+        Logger("Failed to make parent dir for file.", LEVEL_ERROR, SCREEN_YES);
         return -1;
     }
 
     char resolvedPath[PATH_MAX] = {0};
     if (realpath(path, resolvedPath) == NULL && errno != ENOENT) {
-        char* str = FormatLogMessage("failed to resolve path %s.", path);
-        Logger(str, LEVEL_ERROR, SCREEN_YES);
-        free(str);
+        Logger("failed to resolve path.", LEVEL_ERROR, SCREEN_YES);
         return -1;
     }
 
     int fd = open(resolvedPath, O_NOFOLLOW | O_CREAT, mode);
     if (fd < 0) {
-        char* str = FormatLogMessage("cannot create file: %s.", resolvedPath);
-        Logger(str, LEVEL_ERROR, SCREEN_YES);
-        free(str);
+        Logger("cannot create file.", LEVEL_ERROR, SCREEN_YES);
         return -1;
     }
     close(fd);
@@ -174,6 +168,6 @@ int CheckLegality(const char* filename)
             return -1;
         }
     } while (strcmp(dirname(buf), "/"));
-    
+
     return 0;
 }
\ No newline at end of file