From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 1 Jan 2015 16:15:50 +0000 (-0500)
Subject: network: fix scanf/printf format
X-Git-Tag: v219~724
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=ef7532531942d59f81bfbd8a8f923f17e4827952;p=elogind.git

network: fix scanf/printf format

usec_t is defined as 64 bit wide, but long is 32 bit on many archs.
---

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++;
                         }
                 }