83 lines
3.0 KiB
Diff
83 lines
3.0 KiB
Diff
|
From 19810333a97614619a1e2c945c253c964ef02d3b Mon Sep 17 00:00:00 2001
|
||
|
|
From: haozi007 <liuhao27@huawei.com>
|
||
|
|
Date: Wed, 6 Sep 2023 14:22:21 +0800
|
||
|
|
Subject: [PATCH 3/8] improve code of function in log
|
||
|
|
|
||
|
|
Signed-off-by: haozi007 <liuhao27@huawei.com>
|
||
|
|
---
|
||
|
|
src/runtime/lcrcontainer_execute.c | 4 ++--
|
||
|
|
src/third_party/log.c | 6 +++---
|
||
|
|
src/third_party/log.h | 4 ++--
|
||
|
|
3 files changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/runtime/lcrcontainer_execute.c b/src/runtime/lcrcontainer_execute.c
|
||
|
|
index f2bb944..e91ff27 100644
|
||
|
|
--- a/src/runtime/lcrcontainer_execute.c
|
||
|
|
+++ b/src/runtime/lcrcontainer_execute.c
|
||
|
|
@@ -883,7 +883,7 @@ static void execute_lxc_attach(const char *name, const char *path, const struct
|
||
|
|
|
||
|
|
execvp("lxc-attach", params);
|
||
|
|
|
||
|
|
- COMMAND_ERROR("Failed to exec lxc-attach: %s", strerror(errno));
|
||
|
|
+ CMD_SYSERROR("Failed to exec lxc-attach");
|
||
|
|
free(params);
|
||
|
|
exit(EXIT_FAILURE);
|
||
|
|
}
|
||
|
|
@@ -1027,6 +1027,6 @@ void execute_lxc_start(const char *name, const char *path, const struct lcr_star
|
||
|
|
|
||
|
|
execvp("lxc-start", params);
|
||
|
|
|
||
|
|
- COMMAND_ERROR("Failed to exec lxc-start: %s.", strerror(errno));
|
||
|
|
+ CMD_SYSERROR("Failed to exec lxc-start.");
|
||
|
|
exit(EXIT_FAILURE);
|
||
|
|
}
|
||
|
|
diff --git a/src/third_party/log.c b/src/third_party/log.c
|
||
|
|
index 5ba638b..5097eb8 100644
|
||
|
|
--- a/src/third_party/log.c
|
||
|
|
+++ b/src/third_party/log.c
|
||
|
|
@@ -309,18 +309,18 @@ static int open_fifo(const char *fifo_path)
|
||
|
|
|
||
|
|
nret = mknod(fifo_path, S_IFIFO | S_IRUSR | S_IWUSR, (dev_t)0);
|
||
|
|
if (nret && errno != EEXIST) {
|
||
|
|
- COMMAND_ERROR("Mknod failed: %s", strerror(errno));
|
||
|
|
+ CMD_SYSERROR("Mknod failed");
|
||
|
|
return nret;
|
||
|
|
}
|
||
|
|
|
||
|
|
fifo_fd = lcr_util_open(fifo_path, O_RDWR | O_NONBLOCK, 0);
|
||
|
|
if (fifo_fd == -1) {
|
||
|
|
- COMMAND_ERROR("Open fifo %s failed: %s", fifo_path, strerror(errno));
|
||
|
|
+ CMD_SYSERROR("Open fifo %s failed", fifo_path);
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
|
||
|
|
if (fcntl(fifo_fd, F_SETPIPE_SZ, LOG_FIFO_SIZE) == -1) {
|
||
|
|
- COMMAND_ERROR("Set fifo buffer size failed: %s", strerror(errno));
|
||
|
|
+ CMD_SYSERROR("Set fifo buffer size failed");
|
||
|
|
close(fifo_fd);
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
diff --git a/src/third_party/log.h b/src/third_party/log.h
|
||
|
|
index 3462b17..d0e5fa8 100644
|
||
|
|
--- a/src/third_party/log.h
|
||
|
|
+++ b/src/third_party/log.h
|
||
|
|
@@ -417,13 +417,13 @@ lxc_log_priority_define(&g_lxc_log_category_lxc, FATAL);
|
||
|
|
#define CMD_SYSERROR(format, ...) \
|
||
|
|
do { \
|
||
|
|
lxc_log_strerror_r; \
|
||
|
|
- fprintf(stderr, "%s - " format, ptr, ##__VA_ARGS__); \
|
||
|
|
+ fprintf(stderr, "%s - " format "\n", ptr, ##__VA_ARGS__); \
|
||
|
|
} while (0)
|
||
|
|
|
||
|
|
#define CMD_SYSINFO(format, ...) \
|
||
|
|
do { \
|
||
|
|
lxc_log_strerror_r; \
|
||
|
|
- printf("%s - " format, ptr, ##__VA_ARGS__); \
|
||
|
|
+ printf("%s - " format "\n", ptr, ##__VA_ARGS__); \
|
||
|
|
} while (0)
|
||
|
|
|
||
|
|
#define COMMAND_ERROR(fmt, args...) \
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|