chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ebbacbd
)
sd-bus: drop weird empty lines
author
David Herrmann
<dh.herrmann@gmail.com>
Wed, 9 Sep 2015 12:57:04 +0000
(14:57 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Wed, 29 Mar 2017 08:45:09 +0000
(10:45 +0200)
We should never put empty lines between `if` and `else if`, unless we use
braces.
src/libelogind/sd-bus/sd-bus.c
patch
|
blob
|
history
diff --git
a/src/libelogind/sd-bus/sd-bus.c
b/src/libelogind/sd-bus/sd-bus.c
index 6acc9f3860bc27473941c02f63aa9a401567cfb4..70f1c93fbc5401b50da03516e041adc76a900e69 100644
(file)
--- a/
src/libelogind/sd-bus/sd-bus.c
+++ b/
src/libelogind/sd-bus/sd-bus.c
@@
-1032,7
+1032,6
@@
static int bus_start_address(sd_bus *b) {
if (b->exec_path)
r = bus_socket_exec(b);
-
else if ((b->nspid > 0 || b->machine) && b->kernel) {
r = bus_container_connect_kernel(b);
if (r < 0 && !IN_SET(r, -ENOENT, -ESOCKTNOSUPPORT))
@@
-1054,7
+1053,6
@@
static int bus_start_address(sd_bus *b) {
r = bus_socket_connect(b);
else
skipped = true;
-
} else
skipped = true;