From: 2xsec Date: Tue, 26 Jun 2018 05:41:54 +0000 (+0900) Subject: log: remove strerror() from SYSERROR call X-Git-Tag: lxc-3.1.0~230^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5be6a7caa237450404751e2f23964c18eb438b7;p=thirdparty%2Flxc.git log: remove strerror() from SYSERROR call Signed-off-by: 2xsec --- diff --git a/src/lxc/cmd/lxc_monitord.c b/src/lxc/cmd/lxc_monitord.c index 4f8db5707..e2124953c 100644 --- a/src/lxc/cmd/lxc_monitord.c +++ b/src/lxc/cmd/lxc_monitord.c @@ -300,7 +300,7 @@ static int lxc_monitord_fifo_handler(int fd, uint32_t events, void *data, ret = read(fd, &msglxc, sizeof(msglxc)); if (ret != sizeof(msglxc)) { - SYSERROR("Reading from fifo failed: %s.", strerror(errno)); + SYSERROR("Reading from fifo failed"); return LXC_MAINLOOP_CLOSE; } diff --git a/src/lxc/lsm/lsm.c b/src/lxc/lsm/lsm.c index e404002d6..3f71cdd73 100644 --- a/src/lxc/lsm/lsm.c +++ b/src/lxc/lsm/lsm.c @@ -112,8 +112,7 @@ int lsm_process_label_fd_get(pid_t pid, bool on_exec) labelfd = open(path, O_RDWR); if (labelfd < 0) { - SYSERROR("%s - Unable to %s LSM label file descriptor", - name, strerror(errno)); + SYSERROR("Unable to %s LSM label file descriptor", name); return -1; } diff --git a/src/lxc/monitor.c b/src/lxc/monitor.c index 5c866ae84..2bd3a451e 100644 --- a/src/lxc/monitor.c +++ b/src/lxc/monitor.c @@ -261,7 +261,7 @@ int lxc_monitor_read_fdset(struct pollfd *fds, nfds_t nfds, struct lxc_msg *msg, fds[i].revents = 0; ret = recv(fds[i].fd, msg, sizeof(*msg), 0); if (ret <= 0) { - SYSERROR("Failed to receive message. Did monitord die?: %s.", strerror(errno)); + SYSERROR("Failed to receive message. Did monitord die?"); return -1; } return ret; diff --git a/src/lxc/storage/overlay.c b/src/lxc/storage/overlay.c index 05d1a3fe0..a426a0219 100644 --- a/src/lxc/storage/overlay.c +++ b/src/lxc/storage/overlay.c @@ -645,9 +645,8 @@ int ovl_mount(struct lxc_storage *bdev) ret = ovl_remount_on_enodev(lower, bdev->dest, ovl_name, MS_MGC_VAL | mntflags, options); if (ret < 0) - SYSERROR("Failed to mount \"%s\" on \"%s\" with " - "options \"%s\": %s", - lower, bdev->dest, options, strerror(errno)); + SYSERROR("Failed to mount \"%s\" on \"%s\" with options \"%s\"", + lower, bdev->dest, options); else INFO("Mounted \"%s\" on \"%s\" with options \"%s\"", lower, bdev->dest, options);