networkd: add networkd-wait-online

[elogind.git] / src / login / logind-session.c

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index d7c074bdce8b4022bcbdf1675793b57fd944ff20..548f049202e9c1baecb2b66ac1830f4e1c62a648 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -480,7 +480,7 @@ static int session_start_scope(Session *s) {
         if (!s->scope) {
                 _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
                 _cleanup_free_ char *description = NULL;
-                char *scope, *job;
+                char *scope, *job = NULL;
 
                 description = strjoin("Session ", s->id, " of user ", s->user->name, NULL);
                 if (!description)
@@ -567,7 +567,7 @@ int session_start(Session *s) {
 
 static int session_stop_scope(Session *s, bool force) {
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
-        char *job;
+        char *job = NULL;
         int r;
 
         assert(s);
@@ -683,7 +683,7 @@ void session_release(Session *s) {
                 return;
 
         if (!s->timer_event_source)
-                sd_event_add_monotonic(s->manager->event, now(CLOCK_MONOTONIC) + RELEASE_USEC, 0, release_timeout_callback, s, &s->timer_event_source);
+                sd_event_add_monotonic(s->manager->event, &s->timer_event_source, now(CLOCK_MONOTONIC) + RELEASE_USEC, 0, release_timeout_callback, s);
 }
 
 bool session_is_active(Session *s) {
@@ -844,7 +844,7 @@ int session_create_fifo(Session *s) {
         }
 
         if (!s->fifo_event_source) {
-                r = sd_event_add_io(s->manager->event, s->fifo_fd, 0, session_dispatch_fifo, s, &s->fifo_event_source);
+                r = sd_event_add_io(s->manager->event, &s->fifo_event_source, s->fifo_fd, 0, session_dispatch_fifo, s);
                 if (r < 0)
                         return r;
 
@@ -986,7 +986,7 @@ void session_mute_vt(Session *s) {
         sigaddset(&mask, SIGUSR1);
         sigprocmask(SIG_BLOCK, &mask, NULL);
 
-        r = sd_event_add_signal(s->manager->event, SIGUSR1, session_vt_fn, s, &s->vt_source);
+        r = sd_event_add_signal(s->manager->event, &s->vt_source, SIGUSR1, session_vt_fn, s);
         if (r < 0)
                 goto error;
 
@@ -1008,7 +1008,7 @@ error:
 }
 
 void session_restore_vt(Session *s) {
-        _cleanup_free_ char *utf8;
+        _cleanup_free_ char *utf8 = NULL;
         int vt, kb = K_XLATE;
         struct vt_mode mode = { 0 };