make gcc shut up

[elogind.git] / src / libsystemd / sd-event / sd-event.c

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index f33a9ecf9ac8dee1b8d6ba4f74c68429d120ad9e..cda92e260454c4f6575ca3786f079f55fa4ab000 100644 (file)
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -642,9 +642,9 @@ static int event_setup_timer_fd(
                 int *timer_fd,
                 clockid_t id) {
 
+        sd_id128_t bootid = {};
         struct epoll_event ev = {};
         int r, fd;
-        sd_id128_t bootid;
 
         assert(e);
         assert(timer_fd);
@@ -1286,8 +1286,6 @@ _public_ int sd_event_source_set_enabled(sd_event_source *s, int m) {
                         break;
 
                 case SOURCE_CHILD:
-                        s->enabled = m;
-
                         if (s->enabled == SD_EVENT_OFF) {
                                 s->event->n_enabled_child_sources++;
 
@@ -1296,6 +1294,8 @@ _public_ int sd_event_source_set_enabled(sd_event_source *s, int m) {
                                         event_update_signal_fd(s->event);
                                 }
                         }
+
+                        s->enabled = m;
                         break;
 
                 case SOURCE_EXIT:
@@ -2126,7 +2126,7 @@ _public_ int sd_event_get_now_monotonic(sd_event *e, uint64_t *usec) {
 _public_ int sd_event_default(sd_event **ret) {
 
         static thread_local sd_event *default_event = NULL;
-        sd_event *e;
+        sd_event *e = NULL;
         int r;
 
         if (!ret)