[CRIU] [PATCH 08/14] criu: musl scanf and printf don't support the L modifer for intergers
Andrei Vagin
avagin at virtuozzo.com
Sat Jun 2 00:02:58 MSK 2018
Signed-off-by: Andrei Vagin <avagin at virtuozzo.com>
---
criu/fsnotify.c | 2 +-
criu/proc_parse.c | 2 +-
criu/signalfd.c | 2 +-
criu/uffd.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/criu/fsnotify.c b/criu/fsnotify.c
index 73dae3938..001f006bb 100644
--- a/criu/fsnotify.c
+++ b/criu/fsnotify.c
@@ -203,7 +203,7 @@ static int open_handle(unsigned int s_dev, unsigned long i_ino,
decode_handle(&handle, f_handle);
- pr_debug("Opening fhandle %x:%Lx...\n",
+ pr_debug("Opening fhandle %x:%llx...\n",
s_dev, (unsigned long long)handle.__handle[0]);
for (m = mntinfo; m; m = m->next) {
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index edc56bb99..b431168ff 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1855,7 +1855,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
if (type != FD_TYPES__SIGNALFD)
goto parse_err;
- ret = sscanf(str, "sigmask: %Lx",
+ ret = sscanf(str, "sigmask: %llx",
(unsigned long long *)&sfd->sigmask);
if (ret != 1)
goto parse_err;
diff --git a/criu/signalfd.c b/criu/signalfd.c
index bd117a3e0..1bb87d08c 100644
--- a/criu/signalfd.c
+++ b/criu/signalfd.c
@@ -52,7 +52,7 @@ static void sigset_fill(sigset_t *to, unsigned long long from)
{
int sig;
- pr_info("\tCalculating sigmask for %Lx\n", from);
+ pr_info("\tCalculating sigmask for %llx\n", from);
sigemptyset(to);
for (sig = 1; sig < NSIG; sig++)
if (from & (1ULL << (sig - 1))) {
diff --git a/criu/uffd.c b/criu/uffd.c
index 114118098..4a62ab4c1 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -1031,7 +1031,7 @@ static int handle_remove(struct lazy_pages_info *lpi, struct uffd_msg *msg)
unreg.start = msg->arg.remove.start;
unreg.len = msg->arg.remove.end - msg->arg.remove.start;
- lp_debug(lpi, "%s: %Lx(%Lx)\n",
+ lp_debug(lpi, "%s: %llx(%llx)\n",
msg->event == UFFD_EVENT_REMOVE ? "REMOVE" : "UNMAP",
unreg.start, unreg.len);
--
2.14.3
More information about the CRIU
mailing list