Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

log: remove all uses of %m specifier in pr_* functions

Browse source 
As our pr_* functions are complex and can call different system calls
inside before actual printing (e.g. gettimeofday for timestamps) actual
errno at the time of printing may be changed.

Let's just use %s + strerror(errno) instead of %m with pr_* functions to
be explicit that errno to string transformation happens before calling
anything else.

Note: tcp_repair_off is called from pie with no pr_perror defined due to
CR_NOGLIBC set and if I use errno variable there I get "Unexpected
undefined symbol: `__errno_location'. External symbol in PIE?", so it
seems there is no way to print errno there, so let's just skip it.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
This commit is contained in:
Pavel Tikhomirov 2023-01-25 11:01:56 +03:00 • committed by Andrei Vagin
parent 7459d02043
commit 8cfda2748c
5 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compel/include/log.h
View file

@ -1,6 +1,9 @@
#ifndef COMPEL_LOG_H__
#define COMPEL_LOG_H__
#include <errno.h>
#include <string.h>
#include "uapi/compel/log.h"
#ifndef LOG_PREFIX
@ -45,6 +48,6 @@ extern void compel_print_on_level(unsigned int loglevel, const char *format, ...
#define pr_debug(fmt, ...) compel_print_on_level(COMPEL_LOG_DEBUG, LOG_PREFIX fmt, ##__VA_ARGS__)
#define pr_perror(fmt, ...) pr_err(fmt ": %m\n", ##__VA_ARGS__)
#define pr_perror(fmt, ...) pr_err(fmt ": %s\n", ##__VA_ARGS__, strerror(errno))
#endif /* COMPEL_LOG_H__ */

2
criu/fsnotify.c
View file

@ -183,7 +183,7 @@ static char *alloc_openable(unsigned int s_dev, unsigned long i_ino, FhEntry *f_
return path;
}
} else
pr_debug("\t\t\tnot openable as %s (%m)\n", __path);
pr_debug("\t\t\tnot openable as %s (%s)\n", __path, strerror(errno));
}
err:

2
criu/include/sk-inet.h
View file

@ -76,7 +76,7 @@ static inline void tcp_repair_off(int fd)
ret = setsockopt(fd, SOL_TCP, TCP_REPAIR, &aux, sizeof(aux));
if (ret < 0)
pr_err("Failed to turn off repair mode on socket: %m\n");
pr_err("Failed to turn off repair mode on socket\n");
}
extern void tcp_locked_conn_add(struct inet_sk_info *);

4
criu/kerndat.c
View file

@ -1055,9 +1055,9 @@ static int kerndat_has_move_mount_set_group(void)
exit_code = 0;
out:
if (umount2(tmpdir, MNT_DETACH))
pr_warn("Fail to umount2 %s: %m\n", tmpdir);
pr_warn("Fail to umount2 %s: %s\n", tmpdir, strerror(errno));
if (rmdir(tmpdir))
pr_warn("Fail to rmdir %s: %m\n", tmpdir);
pr_warn("Fail to rmdir %s: %s\n", tmpdir, strerror(errno));
return exit_code;
}

7
criu/sk-unix.c
View file

@ -221,7 +221,7 @@ int kerndat_socket_unix_file(void)
}
fd = ioctl(sk, SIOCUNIXFILE);
if (fd < 0 && errno != ENOENT) {
pr_warn("Unable to open a socket file: %m\n");
pr_warn("Unable to open a socket file: %s\n", strerror(errno));
kdat.sk_unix_file = false;
close(sk);
return 0;
@ -620,7 +620,8 @@ static int unix_resolve_name_old(int lfd, uint32_t id, struct unix_sk_desc *d, U
snprintf(rpath, sizeof(rpath), ".%s", name);
if (fstatat(mntns_root, rpath, &st, 0)) {
if (errno != ENOENT) {
pr_warn("Can't stat socket %#" PRIx32 "(%s), skipping: %m (err %d)\n", id, rpath, errno);
pr_warn("Can't stat socket %#" PRIx32 "(%s), skipping: %s (err %d)\n", id, rpath,
strerror(errno), errno);
goto skip;
}
@ -669,7 +670,7 @@ static int unix_resolve_name(int lfd, uint32_t id, struct unix_sk_desc *d, UnixS
fd = ioctl(lfd, SIOCUNIXFILE);
if (fd < 0) {
pr_warn("Unable to get a socket file descriptor with SIOCUNIXFILE ioctl: %m\n");
pr_warn("Unable to get a socket file descriptor with SIOCUNIXFILE ioctl: %s\n", strerror(errno));
goto fallback;
}