chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-event: return 'r' rather than '-errno'
[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 d6549148bbfe6e090cc4b2d8a7d94ca9bdfa12d3..7917ab934ae4f233732180be5e70c72266cf1224 100644
(file)
--- a/
src/libsystemd/sd-event/sd-event.c
+++ b/
src/libsystemd/sd-event/sd-event.c
@@
-779,7
+779,7
@@
_public_ int sd_event_add_io(
r = source_io_register(s, s->enabled, events);
if (r < 0) {
source_free(s);
r = source_io_register(s, s->enabled, events);
if (r < 0) {
source_free(s);
- return
-errno
;
+ return
r
;
}
if (ret)
}
if (ret)
@@
-894,6
+894,8
@@
_public_ int sd_event_add_time(
s->userdata = userdata;
s->enabled = SD_EVENT_ONESHOT;
s->userdata = userdata;
s->enabled = SD_EVENT_ONESHOT;
+ d->needs_rearm = true;
+
r = prioq_put(d->earliest, s, &s->time.earliest_index);
if (r < 0)
goto fail;
r = prioq_put(d->earliest, s, &s->time.earliest_index);
if (r < 0)
goto fail;
@@
-902,8
+904,6
@@
_public_ int sd_event_add_time(
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- d->needs_rearm = true;
-
if (ret)
*ret = s;
if (ret)
*ret = s;
@@
-1060,7
+1060,7
@@
_public_ int sd_event_add_child(
r = event_update_signal_fd(e);
if (r < 0) {
source_free(s);
r = event_update_signal_fd(e);
if (r < 0) {
source_free(s);
- return
-errno
;
+ return
r
;
}
}
}
}
@@
-1755,7
+1755,7
@@
static int event_arm_timer(
assert(e);
assert(d);
assert(e);
assert(d);
- if (
_likely_(!d->needs_rearm)
)
+ if (
!d->needs_rearm
)
return 0;
else
d->needs_rearm = false;
return 0;
else
d->needs_rearm = false;
@@
-1872,6
+1872,7
@@
static int process_timer(
prioq_reshuffle(d->earliest, s, &s->time.earliest_index);
prioq_reshuffle(d->latest, s, &s->time.latest_index);
prioq_reshuffle(d->earliest, s, &s->time.earliest_index);
prioq_reshuffle(d->latest, s, &s->time.latest_index);
+ d->needs_rearm = true;
}
return 0;
}
return 0;