summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-06-08 23:38:27 +0200
committerLennart Poettering <lennart@poettering.net>2015-06-08 23:38:27 +0200
commit02776da6ec90d28799561407d8a07f76d1c2c120 (patch)
treed2d2cc5120adc6bbba4a5dbe3dd9cad120a41a5d /src/core
parent4d1f0021d341925fe13eccbf006c6e65c816c1d1 (diff)
parent920b52e4909d9dc812817fd8b82f83ca23a11c91 (diff)
Merge pull request #108 from phomes/master
tree-wide: remove spurious space
Diffstat (limited to 'src/core')
-rw-r--r--src/core/busname.c2
-rw-r--r--src/core/manager.c2
-rw-r--r--src/core/socket.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/busname.c b/src/core/busname.c
index 11f3b98009..3f5abbcb24 100644
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -125,7 +125,7 @@ static int busname_arm_timer(BusName *n) {
return sd_event_source_set_enabled(n->timer_event_source, SD_EVENT_ONESHOT);
}
- r = sd_event_add_time(
+ r = sd_event_add_time(
UNIT(n)->manager->event,
&n->timer_event_source,
CLOCK_MONOTONIC,
diff --git a/src/core/manager.c b/src/core/manager.c
index a1c54339ea..564fb5d579 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -665,7 +665,7 @@ static int manager_setup_notify(Manager *m) {
if (m->notify_fd < 0) {
_cleanup_close_ int fd = -1;
- union sockaddr_union sa = {
+ union sockaddr_union sa = {
.sa.sa_family = AF_UNIX,
};
static const int one = 1;
diff --git a/src/core/socket.c b/src/core/socket.c
index fc5eb1464a..0239962055 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -832,7 +832,7 @@ static void socket_apply_socket_options(Socket *s, int fd) {
}
if (s->keep_alive_interval) {
- int value = s->keep_alive_interval / USEC_PER_SEC;
+ int value = s->keep_alive_interval / USEC_PER_SEC;
if (setsockopt(fd, SOL_TCP, TCP_KEEPINTVL, &value, sizeof(value)) < 0)
log_unit_warning_errno(UNIT(s), errno, "TCP_KEEPINTVL failed: %m");
}
@@ -2589,7 +2589,7 @@ static void socket_trigger_notify(Unit *u, Unit *other) {
/* Don't propagate state changes from the service if we are
already down or accepting connections */
- if ((s->state != SOCKET_RUNNING &&
+ if ((s->state != SOCKET_RUNNING &&
s->state != SOCKET_LISTENING) ||
s->accept)
return;