X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fsd-event.c;h=b3a6c5b08ae845aed532723c60aec8590ce8b1c9;hb=9ec9694ce3dbc137735b2992dfa305d0e5948815;hp=ace97dc7393767f3fbdfa22a11cdba552b2557df;hpb=d09d5ecda2172ba539f1b08da9f3e9787be37229;p=elogind.git diff --git a/src/libsystemd-bus/sd-event.c b/src/libsystemd-bus/sd-event.c index ace97dc73..b3a6c5b08 100644 --- a/src/libsystemd-bus/sd-event.c +++ b/src/libsystemd-bus/sd-event.c @@ -1430,15 +1430,6 @@ static int process_io(sd_event *e, sd_event_source *s, uint32_t events) { s->io.revents = events; - /* - If this is a oneshot event source, then we added it to the - epoll with EPOLLONESHOT, hence we know it's not registered - anymore. We can save a syscall here... - */ - - if (s->enabled == SD_EVENT_ONESHOT) - s->io.registered = false; - return source_set_pending(s, true); } @@ -1594,7 +1585,7 @@ static int process_signal(sd_event *e, uint32_t events) { } static int source_dispatch(sd_event_source *s) { - int r; + int r = 0; assert(s); assert(s->pending || s->type == SOURCE_QUIT);