From ecc3f340abda85325df862ab2da612a78bf34926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 1 Nov 2017 22:43:32 +0100 Subject: [PATCH] networkd: fix two format string mismatches ../src/network/networkd-link.c:3577:84: warning: format specifies type 'unsigned char' but the argument has type 'uint32_t' (aka 'unsigned int') [-Wformat] route->dst_prefixlen, route->tos, route->priority, route->table, route->lifetime); ^~~~~~~~~~~~ ../src/network/networkd-manager.c:1146:132: warning: format specifies type 'unsigned char' but the argument has type 'uint32_t' (aka 'unsigned int') [-Wformat] rule->from_prefixlen, space ? " " : "", to_str, rule->to_prefixlen, rule->tos, rule->fwmark, rule->fwmask, rule->table); ^~~~~~~~~~~ Also add some line breaks to make it easier to see which argument is for which part of the format string. --- src/network/networkd-link.c | 3 ++- src/network/networkd-manager.c | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 70039940bc..fd063e43d2 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -3573,7 +3573,8 @@ int link_save(Link *link) { if (r < 0) goto fail; - fprintf(f, "%s%s/%hhu/%hhu/%"PRIu32"/%hhu/"USEC_FMT, space ? " " : "", route_str, + fprintf(f, "%s%s/%hhu/%hhu/%"PRIu32"/%"PRIu32"/"USEC_FMT, + space ? " " : "", route_str, route->dst_prefixlen, route->tos, route->priority, route->table, route->lifetime); space = true; } diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 200d0f622d..574bd0f5cb 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -1142,8 +1142,12 @@ static int manager_save(Manager *m) { goto fail; } - fprintf(f, "from=%s%s/%hhu to=%s%s/%hhu tos=%hhu fwmark=%"PRIu32"/%"PRIu32" table=%hhu", space ? " " : "", from_str, - rule->from_prefixlen, space ? " " : "", to_str, rule->to_prefixlen, rule->tos, rule->fwmark, rule->fwmask, rule->table); + fprintf(f, "from=%s%s/%hhu to=%s%s/%hhu tos=%hhu fwmark=%"PRIu32"/%"PRIu32" table=%"PRIu32, + space ? " " : "", from_str, rule->from_prefixlen, + space ? " " : "", to_str, rule->to_prefixlen, + rule->tos, + rule->fwmark, rule->fwmask, + rule->table); fputc('\n', f); }