summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-02-28 19:12:31 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-02-28 19:12:31 -0500
commit0493ccd9ed7ad561122188223a6b28844e39ea15 (patch)
treee0c23dae3a62d5e2ed206672c239cf2352fa2b04
parent8f462d878c6c14c0ec9582615d18dd6a7d72fa28 (diff)
parent17a8630621815d27bcb2d6c48d89a0cfbe34a76c (diff)
Merge pull request #2753 from phomes/trivial-fixes2
Trivial fixes
-rw-r--r--src/core/execute.c2
-rw-r--r--src/core/smack-setup.c2
-rw-r--r--src/stdio-bridge/stdio-bridge.c4
3 files changed, 3 insertions, 5 deletions
diff --git a/src/core/execute.c b/src/core/execute.c
index 8ede9e9afb..517c2fb45b 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1876,7 +1876,7 @@ static int exec_child(
* also to the context secure_bits so that we don't try to
* drop the bit away next. */
- secure_bits |= 1<<SECURE_KEEP_CAPS;
+ secure_bits |= 1<<SECURE_KEEP_CAPS;
}
}
diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
index 0c26e85460..5a6d11cfa1 100644
--- a/src/core/smack-setup.c
+++ b/src/core/smack-setup.c
@@ -261,7 +261,7 @@ static int write_netlabel_rules(const char* srcdir) {
}
}
- return r;
+ return r;
}
#endif
diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c
index 91eace90e2..85b99ce161 100644
--- a/src/stdio-bridge/stdio-bridge.c
+++ b/src/stdio-bridge/stdio-bridge.c
@@ -190,7 +190,7 @@ int main(int argc, char *argv[]) {
}
for (;;) {
- _cleanup_(sd_bus_message_unrefp)sd_bus_message *m = NULL;
+ _cleanup_(sd_bus_message_unrefp)sd_bus_message *m = NULL;
int events_a, events_b, fd;
uint64_t timeout_a, timeout_b, t;
struct timespec _ts, *ts;
@@ -294,8 +294,6 @@ int main(int argc, char *argv[]) {
}
}
- r = 0;
-
finish:
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}