From 0a1beeb64207eaa88ab9236787b1cbc2f704ae14 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 28 Nov 2014 11:58:34 +0100 Subject: treewide: auto-convert the simple cases to log_*_errno() As a followup to 086891e5c1 "log: add an "error" parameter to all low-level logging calls and intrdouce log_error_errno() as log calls that take error numbers", use sed to convert the simple cases to use the new macros: find . -name '*.[ch]' | xargs sed -r -i -e \ 's/log_(debug|info|notice|warning|error|emergency)\("(.*)%s"(.*), strerror\(-([a-zA-Z_]+)\)\);/log_\1_errno(-\4, "\2%m"\3);/' Multi-line log_*() invocations are not covered. And we also should add log_unit_*_errno(). --- src/network/networkd-route.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/network/networkd-route.c') diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index 82c9e002fd..6db1bcffbd 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -114,7 +114,7 @@ int route_drop(Route *route, Link *link, RTM_DELROUTE, route->family, route->protocol); if (r < 0) { - log_error("Could not create RTM_DELROUTE message: %s", strerror(-r)); + log_error_errno(-r, "Could not create RTM_DELROUTE message: %m"); return r; } @@ -124,7 +124,7 @@ int route_drop(Route *route, Link *link, else if (route->family == AF_INET6) r = sd_rtnl_message_append_in6_addr(req, RTA_GATEWAY, &route->in_addr.in6); if (r < 0) { - log_error("Could not append RTA_GATEWAY attribute: %s", strerror(-r)); + log_error_errno(-r, "Could not append RTA_GATEWAY attribute: %m"); return r; } } @@ -135,13 +135,13 @@ int route_drop(Route *route, Link *link, else if (route->family == AF_INET6) r = sd_rtnl_message_append_in6_addr(req, RTA_DST, &route->dst_addr.in6); if (r < 0) { - log_error("Could not append RTA_DST attribute: %s", strerror(-r)); + log_error_errno(-r, "Could not append RTA_DST attribute: %m"); return r; } r = sd_rtnl_message_route_set_dst_prefixlen(req, route->dst_prefixlen); if (r < 0) { - log_error("Could not set destination prefix length: %s", strerror(-r)); + log_error_errno(-r, "Could not set destination prefix length: %m"); return r; } } @@ -152,32 +152,32 @@ int route_drop(Route *route, Link *link, else if (route->family == AF_INET6) r = sd_rtnl_message_append_in6_addr(req, RTA_PREFSRC, &route->prefsrc_addr.in6); if (r < 0) { - log_error("Could not append RTA_PREFSRC attribute: %s", strerror(-r)); + log_error_errno(-r, "Could not append RTA_PREFSRC attribute: %m"); return r; } } r = sd_rtnl_message_route_set_scope(req, route->scope); if (r < 0) { - log_error("Could not set scope: %s", strerror(-r)); + log_error_errno(-r, "Could not set scope: %m"); return r; } r = sd_rtnl_message_append_u32(req, RTA_PRIORITY, route->metrics); if (r < 0) { - log_error("Could not append RTA_PRIORITY attribute: %s", strerror(-r)); + log_error_errno(-r, "Could not append RTA_PRIORITY attribute: %m"); return r; } r = sd_rtnl_message_append_u32(req, RTA_OIF, link->ifindex); if (r < 0) { - log_error("Could not append RTA_OIF attribute: %s", strerror(-r)); + log_error_errno(-r, "Could not append RTA_OIF attribute: %m"); return r; } r = sd_rtnl_call_async(link->manager->rtnl, req, callback, link, 0, NULL); if (r < 0) { - log_error("Could not send rtnetlink message: %s", strerror(-r)); + log_error_errno(-r, "Could not send rtnetlink message: %m"); return r; } @@ -201,7 +201,7 @@ int route_configure(Route *route, Link *link, RTM_NEWROUTE, route->family, route->protocol); if (r < 0) { - log_error("Could not create RTM_NEWROUTE message: %s", strerror(-r)); + log_error_errno(-r, "Could not create RTM_NEWROUTE message: %m"); return r; } @@ -211,7 +211,7 @@ int route_configure(Route *route, Link *link, else if (route->family == AF_INET6) r = sd_rtnl_message_append_in6_addr(req, RTA_GATEWAY, &route->in_addr.in6); if (r < 0) { - log_error("Could not append RTA_GATEWAY attribute: %s", strerror(-r)); + log_error_errno(-r, "Could not append RTA_GATEWAY attribute: %m"); return r; } } @@ -222,13 +222,13 @@ int route_configure(Route *route, Link *link, else if (route->family == AF_INET6) r = sd_rtnl_message_append_in6_addr(req, RTA_DST, &route->dst_addr.in6); if (r < 0) { - log_error("Could not append RTA_DST attribute: %s", strerror(-r)); + log_error_errno(-r, "Could not append RTA_DST attribute: %m"); return r; } r = sd_rtnl_message_route_set_dst_prefixlen(req, route->dst_prefixlen); if (r < 0) { - log_error("Could not set destination prefix length: %s", strerror(-r)); + log_error_errno(-r, "Could not set destination prefix length: %m"); return r; } } @@ -239,32 +239,32 @@ int route_configure(Route *route, Link *link, else if (route->family == AF_INET6) r = sd_rtnl_message_append_in6_addr(req, RTA_PREFSRC, &route->prefsrc_addr.in6); if (r < 0) { - log_error("Could not append RTA_PREFSRC attribute: %s", strerror(-r)); + log_error_errno(-r, "Could not append RTA_PREFSRC attribute: %m"); return r; } } r = sd_rtnl_message_route_set_scope(req, route->scope); if (r < 0) { - log_error("Could not set scope: %s", strerror(-r)); + log_error_errno(-r, "Could not set scope: %m"); return r; } r = sd_rtnl_message_append_u32(req, RTA_PRIORITY, route->metrics); if (r < 0) { - log_error("Could not append RTA_PRIORITY attribute: %s", strerror(-r)); + log_error_errno(-r, "Could not append RTA_PRIORITY attribute: %m"); return r; } r = sd_rtnl_message_append_u32(req, RTA_OIF, link->ifindex); if (r < 0) { - log_error("Could not append RTA_OIF attribute: %s", strerror(-r)); + log_error_errno(-r, "Could not append RTA_OIF attribute: %m"); return r; } r = sd_rtnl_call_async(link->manager->rtnl, req, callback, link, 0, NULL); if (r < 0) { - log_error("Could not send rtnetlink message: %s", strerror(-r)); + log_error_errno(-r, "Could not send rtnetlink message: %m"); return r; } -- cgit v1.2.3-54-g00ecf