summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-06-10 01:27:32 +0200
committerLennart Poettering <lennart@poettering.net>2015-06-10 01:28:58 +0200
commitcde40acc805b855909b95f15fd9a3111e40be672 (patch)
treeb22d13fc5f1929c13b8af32268bdf0e958bd5f09 /src
parentce30c8dcb41dfe9264f79f30c7f51c0e74576638 (diff)
logind,sd-event: drop spurious new-lines
Diffstat (limited to 'src')
-rw-r--r--src/libsystemd/sd-event/sd-event.c1
-rw-r--r--src/login/logind-user.c6
2 files changed, 2 insertions, 5 deletions
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 2b8d1b87ed..00880c983b 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -2384,7 +2384,6 @@ _public_ int sd_event_wait(sd_event *e, uint64_t timeout) {
}
r = -errno;
-
goto finish;
}
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 373c9938e7..c0b473930d 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -738,8 +738,7 @@ int user_kill(User *u, int signo) {
return manager_kill_unit(u->manager, u->slice, KILL_ALL, signo, NULL);
}
-static bool
-elect_display_filter(Session *s) {
+static bool elect_display_filter(Session *s) {
/* Return true if the session is a candidate for the user’s ‘primary
* session’ or ‘display’. */
assert(s);
@@ -747,8 +746,7 @@ elect_display_filter(Session *s) {
return (s->class == SESSION_USER && !s->stopping);
}
-static int
-elect_display_compare(Session *s1, Session *s2) {
+static int elect_display_compare(Session *s1, Session *s2) {
/* Indexed by SessionType. Lower numbers mean more preferred. */
const int type_ranks[_SESSION_TYPE_MAX] = {
[SESSION_UNSPECIFIED] = 0,