X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-wait-online-manager.c;h=3f2b96688c7425fa23b16fddc559d2bca9935607;hb=5eb9e762eab5faa1bc995a39ebbb8fc694755c3e;hp=649a21c80c7949fd99cce8a23d3c92478717fab0;hpb=7de12ae764e73730df0658f9fb04bcf42add48e2;p=elogind.git diff --git a/src/network/networkd-wait-online-manager.c b/src/network/networkd-wait-online-manager.c index 649a21c80..3f2b96688 100644 --- a/src/network/networkd-wait-online-manager.c +++ b/src/network/networkd-wait-online-manager.c @@ -37,7 +37,7 @@ bool manager_all_configured(Manager *m) { char **ifname; bool one_ready = false; - /* wait for all the links given on the commandline to appear */ + /* wait for all the links given on the command line to appear */ STRV_FOREACH(ifname, m->interfaces) { l = hashmap_get(m->links_by_name, *ifname); if (!l) { @@ -80,7 +80,7 @@ static int manager_process_link(sd_rtnl *rtnl, sd_rtnl_message *mm, void *userda Manager *m = userdata; uint16_t type; Link *l; - char *ifname; + const char *ifname; int ifindex, r; assert(rtnl); @@ -134,7 +134,7 @@ static int manager_process_link(sd_rtnl *rtnl, sd_rtnl_message *mm, void *userda return 0; fail: - log_warning("Failed to process RTNL link message: %s", strerror(-r)); + log_warning_errno(r, "Failed to process RTNL link message: %m"); return 0; } @@ -211,7 +211,7 @@ static int on_network_event(sd_event_source *s, int fd, uint32_t revents, void * HASHMAP_FOREACH(l, m->links, i) { r = link_update_monitor(l); if (r < 0) - log_warning("Failed to update monitor information for %i: %s", l->ifindex, strerror(-r)); + log_warning_errno(r, "Failed to update monitor information for %i: %m", l->ifindex); } if (manager_all_configured(m))