systemd/SOURCES/0555-sd-event-follow-coding-style-with-naming-return-para.patch

36 lines
1.1 KiB
Diff
Raw Normal View History

2021-05-18 06:38:04 +00:00
From 846b1dd75e626ad2e2483673eea65774edea9016 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 23 Nov 2020 17:47:16 +0100
Subject: [PATCH] sd-event: follow coding style with naming return parameter
(cherry picked from commit cad143a8f26976a23e634d5e1ecfb7d7ba75c3bf)
Related: #1819868
---
src/libsystemd/sd-event/sd-event.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index be1e6e5f53..739296abcf 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -2285,13 +2285,14 @@ fail:
return r;
}
-_public_ int sd_event_source_get_enabled(sd_event_source *s, int *m) {
+_public_ int sd_event_source_get_enabled(sd_event_source *s, int *ret) {
assert_return(s, -EINVAL);
- assert_return(m, -EINVAL);
assert_return(!event_pid_changed(s->event), -ECHILD);
- *m = s->enabled;
- return 0;
+ if (ret)
+ *ret = s->enabled;
+
+ return s->enabled != SD_EVENT_OFF;
}
static int event_source_disable(sd_event_source *s) {