X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-wait-online.c;h=e62859e1cf9c8b229204a2e853329173026f7c0e;hb=fa041593fe04b12ffd7e81d8b3598a7a6f313fb3;hp=51c6bbd4953e9c51fcfc3ae50d3b05e7ddfa4cb9;hpb=cb6fa44cb5411ed574f14109ee862ff663ab0a36;p=elogind.git diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c index 51c6bbd49..e62859e1c 100644 --- a/src/network/networkd-wait-online.c +++ b/src/network/networkd-wait-online.c @@ -20,8 +20,10 @@ ***/ #include "sd-event.h" +#include "event-util.h" #include "sd-daemon.h" #include "sd-network.h" +#include "network-util.h" #include "util.h" @@ -62,9 +64,9 @@ static int event_handler(sd_event_source *s, int fd, uint32_t revents, } int main(int argc, char *argv[]) { - sd_event *event; - sd_event_source *event_source; - sd_network_monitor *monitor; + _cleanup_event_unref_ sd_event *event = NULL; + _cleanup_event_source_unref_ sd_event_source *event_source = NULL; + _cleanup_network_monitor_unref_ sd_network_monitor *monitor = NULL; int r, fd, events; log_set_target(LOG_TARGET_AUTO); @@ -117,7 +119,7 @@ int main(int argc, char *argv[]) { sd_notify(false, "READY=1\n" - "STATUS=Waiting for network connecitons..."); + "STATUS=Waiting for network connections..."); r = sd_event_loop(event); if (r < 0) { @@ -129,9 +131,5 @@ out: sd_notify(false, "STATUS=All interfaces configured..."); - sd_event_source_unref(event_source); - sd_event_unref(event); - sd_network_monitor_unref(monitor); - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }