From ef7532531942d59f81bfbd8a8f923f17e4827952 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 1 Jan 2015 11:15:50 -0500 Subject: [PATCH] network: fix scanf/printf format usec_t is defined as 64 bit wide, but long is 32 bit on many archs. --- src/libsystemd-network/sd-lldp.c | 2 +- src/network/networkctl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c index fa4531005..86c734b8c 100644 --- a/src/libsystemd-network/sd-lldp.c +++ b/src/libsystemd-network/sd-lldp.c @@ -495,7 +495,7 @@ int sd_lldp_save(sd_lldp *lldp, const char *lldp_file) { if (time - p->until <= 0) continue; - sprintf(buf, "'_TTL=%lu' ", p->until); + sprintf(buf, "'_TTL="USEC_FMT"' ", p->until); k = strappend(s, buf); if (!k) diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 15dfb81e2..cc3ea85e8 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -972,7 +972,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { time = now(CLOCK_BOOTTIME); - sscanf(b, "%lu", &until); + sscanf(b, USEC_FMT, &until); ttl = (until - time) / USEC_PER_SEC; @@ -986,7 +986,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { } if (until > time) { - printf("%10s %24s %16s %16lu %16s\n", links[i].name, chassis, port, ttl, cap); + printf("%10s %24s %16s %16"PRIu64" %16s\n", links[i].name, chassis, port, ttl, cap); j++; } } -- 2.30.2