98 lines
4.0 KiB
Diff
98 lines
4.0 KiB
Diff
From 24579633671fca855dd1c66a4d7614ccf2e7e388 Mon Sep 17 00:00:00 2001
|
|
From: haozi007 <liuhao27@huawei.com>
|
|
Date: Tue, 5 Sep 2023 19:35:37 +0800
|
|
Subject: [PATCH 2/8] remove unnecessary strerror
|
|
|
|
Signed-off-by: haozi007 <liuhao27@huawei.com>
|
|
---
|
|
src/runtime/lcrcontainer_execute.c | 3 +--
|
|
src/runtime/lcrcontainer_extend.c | 16 ++++++++--------
|
|
2 files changed, 9 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/runtime/lcrcontainer_execute.c b/src/runtime/lcrcontainer_execute.c
|
|
index 864c097..f2bb944 100644
|
|
--- a/src/runtime/lcrcontainer_execute.c
|
|
+++ b/src/runtime/lcrcontainer_execute.c
|
|
@@ -71,8 +71,7 @@
|
|
do \
|
|
{ \
|
|
SYSERROR("Error updating cgroup %s to %s", (item), (value)); \
|
|
- lcr_set_error_message(LCR_ERR_RUNTIME, "Error updating cgroup %s to %s: %s", (item), (value), \
|
|
- strerror(errno)); \
|
|
+ lcr_set_error_message(LCR_ERR_RUNTIME, "Error updating cgroup %s to %s.", (item), (value)); \
|
|
} while (0)
|
|
|
|
static inline void add_array_elem(char **array, size_t total, size_t *pos, const char *elem)
|
|
diff --git a/src/runtime/lcrcontainer_extend.c b/src/runtime/lcrcontainer_extend.c
|
|
index 2f3ae9f..8b5a85c 100644
|
|
--- a/src/runtime/lcrcontainer_extend.c
|
|
+++ b/src/runtime/lcrcontainer_extend.c
|
|
@@ -153,7 +153,7 @@ static int make_annotations(oci_runtime_spec *container, const struct lxc_contai
|
|
goto out;
|
|
}
|
|
if (lcr_util_ensure_path(&realpath, anno->values[fpos])) {
|
|
- ERROR("Invalid log path: %s, error: %s.", anno->values[fpos], strerror(errno));
|
|
+ SYSERROR("Invalid log path: %s.", anno->values[fpos]);
|
|
goto out;
|
|
}
|
|
ret = 0;
|
|
@@ -378,7 +378,7 @@ static int lcr_spec_write_seccomp_line(FILE *fp, const char *seccomp)
|
|
|
|
line[nret] = '\n';
|
|
if (fwrite(line, 1, len ,fp) != len) {
|
|
- ERROR("Write file failed: %s", strerror(errno));
|
|
+ SYSERROR("Write file failed");
|
|
goto cleanup;
|
|
}
|
|
|
|
@@ -743,8 +743,8 @@ static FILE *lcr_open_config_file(const char *bundle)
|
|
|
|
fd = lcr_util_open(real_config, O_CREAT | O_TRUNC | O_CLOEXEC | O_WRONLY, CONFIG_FILE_MODE);
|
|
if (fd == -1) {
|
|
- ERROR("Create file %s failed, %s", real_config, strerror(errno));
|
|
- lcr_set_error_message(LCR_ERR_RUNTIME, "Create file %s failed, %s", real_config, strerror(errno));
|
|
+ SYSERROR("Create file %s failed", real_config);
|
|
+ lcr_set_error_message(LCR_ERR_RUNTIME, "Create file %s failed", real_config);
|
|
goto out;
|
|
}
|
|
|
|
@@ -856,7 +856,7 @@ static int lcr_spec_write_config(FILE *fp, const struct lcr_list *lcr_conf)
|
|
line_encode[len] = '\n';
|
|
|
|
if (fwrite(line_encode, 1, len + 1, fp) != len + 1) {
|
|
- ERROR("Write file failed: %s", strerror(errno));
|
|
+ SYSERROR("Write file failed");
|
|
goto cleanup;
|
|
}
|
|
|
|
@@ -908,7 +908,7 @@ char *lcr_get_bundle(const char *lcrpath, const char *name)
|
|
ERROR("Bundle %s does not exist", bundle);
|
|
break;
|
|
default:
|
|
- ERROR("Access %s failed: %s\n", bundle, strerror(errno));
|
|
+ SYSERROR("Access %s failed", bundle);
|
|
}
|
|
goto cleanup;
|
|
}
|
|
@@ -995,7 +995,7 @@ static int lcr_write_file(const char *path, const char *data, size_t len)
|
|
}
|
|
|
|
if (write(fd, data, len) == -1) {
|
|
- ERROR("write data to %s failed: %s", real_path, strerror(errno));
|
|
+ SYSERROR("write data to %s failed", real_path);
|
|
goto out_free;
|
|
}
|
|
|
|
@@ -1023,7 +1023,7 @@ static bool lcr_write_ocihooks(const char *path, const oci_runtime_spec_hooks *h
|
|
}
|
|
|
|
if (lcr_write_file(path, json_hooks, strlen(json_hooks)) == -1) {
|
|
- ERROR("write json hooks failed: %s", strerror(errno));
|
|
+ SYSERROR("write json hooks failed");
|
|
goto out_free;
|
|
}
|
|
|
|
--
|
|
2.34.1
|
|
|