From: Dave Reisner Date: Mon, 25 Nov 2013 23:19:10 +0000 (-0500) Subject: networkd: use correct printf formatter X-Git-Tag: v209~1295 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a9bc6d2df16c1d9f8a99d2cc9be2babf62bd173f networkd: use correct printf formatter uint64_t can be formatted correctly with %ju, rather than casting to unsigned and potentially losing accuracy. --- diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index b93df63f2..ab5da3612 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -126,7 +126,7 @@ static bool link_is_up(Link *link) { } static int link_enter_routes_set(Link *link) { - log_info("Routes set for link %u", (unsigned)link->ifindex); + log_info("Routes set for link %ju", link->ifindex); if (link_is_up(link)) return link_enter_configured(link); @@ -150,8 +150,8 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EEXIST) { - log_warning("Could not set route on interface %u: %s", - (unsigned)link->ifindex, strerror(-r)); + log_warning("Could not set route on interface %ju: %s", + link->ifindex, strerror(-r)); return link_enter_failed(link); } @@ -185,7 +185,7 @@ static int link_enter_set_routes(Link *link) { } static int link_enter_addresses_set(Link *link) { - log_info("Addresses set for link %u", (unsigned)link->ifindex); + log_info("Addresses set for link %ju", link->ifindex); link->state = LINK_STATE_ADDRESSES_SET; @@ -206,8 +206,8 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EEXIST) { - log_warning("Could not set address on interface %u: %s", - (unsigned)link->ifindex, strerror(-r)); + log_warning("Could not set address on interface %ju: %s", + link->ifindex, strerror(-r)); link_enter_failed(link); } @@ -245,8 +245,8 @@ static int link_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); if (r < 0) { - log_warning("Could not bring up interface %u: %s", - (unsigned)link->ifindex, strerror(-r)); + log_warning("Could not bring up interface %ju: %s", + link->ifindex, strerror(-r)); return link_enter_failed(link); } diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index dc2af9dd2..eb3ff2316 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -173,8 +173,8 @@ int network_get(Manager *manager, struct udev_device *device, Network **ret) { int network_apply(Manager *manager, Network *network, Link *link) { int r; - log_info("Network '%s' being applied to link '%u'", - network->description, (unsigned) link->ifindex); + log_info("Network '%s' being applied to link '%ju'", + network->description, link->ifindex); link->network = network;