summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-04-19 12:13:23 +0200
committerSven Eden <yamakuzure@gmx.net>2018-08-24 16:47:08 +0200
commit5a86caf19e625fce150d5c4330783c8d5732b27f (patch)
tree8b8b2d98b6151829dc706d01bdea46eec8404548 /src
parent206dc15a7a29cae1b42521812faf87e0888e07c0 (diff)
tree-wide: drop spurious newlines (#8764)
Double newlines (i.e. one empty lines) are great to structure code. But let's avoid triple newlines (i.e. two empty lines), quadruple newlines, quintuple newlines, …, that's just spurious whitespace. It's an easy way to drop 121 lines of code, and keeps the coding style of our sources a bit tigther.
Diffstat (limited to 'src')
-rw-r--r--src/basic/format-table.c1
-rw-r--r--src/basic/hash-funcs.c1
-rw-r--r--src/basic/mount-util.c1
-rw-r--r--src/basic/random-util.c1
-rw-r--r--src/basic/selinux-util.c1
-rw-r--r--src/basic/socket-util.c2
-rw-r--r--src/core/cgroup.c1
-rw-r--r--src/libelogind/sd-bus/bus-creds.c2
-rw-r--r--src/libelogind/sd-bus/bus-match.c1
-rw-r--r--src/libelogind/sd-bus/bus-message.c2
-rw-r--r--src/libelogind/sd-bus/bus-signature.c1
-rw-r--r--src/libelogind/sd-bus/bus-slot.c1
-rw-r--r--src/libelogind/sd-bus/sd-bus.c1
-rw-r--r--src/login/logind-session.c1
-rw-r--r--src/shared/utmp-wtmp.c1
-rw-r--r--src/test/test-exec-util.c1
-rw-r--r--src/test/test-locale-util.c1
-rw-r--r--src/test/test-parse-util.c1
-rw-r--r--src/test/test-stat-util.c1
-rw-r--r--src/test/test-string-util.c1
20 files changed, 0 insertions, 23 deletions
diff --git a/src/basic/format-table.c b/src/basic/format-table.c
index f1ef562ab..35948a602 100644
--- a/src/basic/format-table.c
+++ b/src/basic/format-table.c
@@ -855,7 +855,6 @@ static const char *table_data_format(TableData *d) {
assert_not_reached("Unexpected type?");
}
-
return d->formatted;
}
diff --git a/src/basic/hash-funcs.c b/src/basic/hash-funcs.c
index b62f2bd87..13e357efd 100644
--- a/src/basic/hash-funcs.c
+++ b/src/basic/hash-funcs.c
@@ -24,7 +24,6 @@ const struct hash_ops string_hash_ops = {
.compare = string_compare_func
};
-
void path_hash_func(const void *p, struct siphash *state) {
const char *q = p;
size_t n;
diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index b3817c03c..1736cf19b 100644
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -860,7 +860,6 @@ const char *mount_propagation_flags_to_string(unsigned long flags) {
return NULL;
}
-
int mount_propagation_flags_from_string(const char *name, unsigned long *ret) {
if (isempty(name))
diff --git a/src/basic/random-util.c b/src/basic/random-util.c
index 803ca790f..fe283050c 100644
--- a/src/basic/random-util.c
+++ b/src/basic/random-util.c
@@ -109,7 +109,6 @@ void initialize_srand(void) {
#endif
x = 0;
-
x ^= (unsigned) now(CLOCK_REALTIME);
x ^= (unsigned) gettid();
diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
index 518a6f5a4..c02ee2ca5 100644
--- a/src/basic/selinux-util.c
+++ b/src/basic/selinux-util.c
@@ -316,7 +316,6 @@ char* mac_selinux_free(char *label) {
if (!mac_selinux_use())
return NULL;
-
freecon(label);
#endif
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 983a7b423..75bfcf98a 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -687,7 +687,6 @@ int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_
return -EOPNOTSUPP;
}
-
*ret = p;
return 0;
}
@@ -1154,7 +1153,6 @@ int flush_accept(int fd) {
};
int r;
-
/* Similar to flush_fd() but flushes all incoming connection by accepting them and immediately closing them. */
for (;;) {
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 9b69fa82e..34ff984df 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1693,7 +1693,6 @@ static void unit_remove_from_cgroup_realize_queue(Unit *u) {
u->in_cgroup_realize_queue = false;
}
-
/* Check if necessary controllers and attributes for a unit are in place.
*
* If so, do nothing.
diff --git a/src/libelogind/sd-bus/bus-creds.c b/src/libelogind/sd-bus/bus-creds.c
index 7db80e72f..8ccb96ff9 100644
--- a/src/libelogind/sd-bus/bus-creds.c
+++ b/src/libelogind/sd-bus/bus-creds.c
@@ -116,7 +116,6 @@ _public_ sd_bus_creds *sd_bus_creds_unref(sd_bus_creds *c) {
sd_bus_message_unref(m);
}
-
return NULL;
}
@@ -209,7 +208,6 @@ _public_ int sd_bus_creds_get_suid(sd_bus_creds *c, uid_t *suid) {
return 0;
}
-
_public_ int sd_bus_creds_get_fsuid(sd_bus_creds *c, uid_t *fsuid) {
assert_return(c, -EINVAL);
assert_return(fsuid, -EINVAL);
diff --git a/src/libelogind/sd-bus/bus-match.c b/src/libelogind/sd-bus/bus-match.c
index 65947264f..d425a6861 100644
--- a/src/libelogind/sd-bus/bus-match.c
+++ b/src/libelogind/sd-bus/bus-match.c
@@ -894,7 +894,6 @@ int bus_match_parse(
components[n_components].value_u8 = u;
n_components++;
-
if (q[quoted] == 0)
break;
diff --git a/src/libelogind/sd-bus/bus-message.c b/src/libelogind/sd-bus/bus-message.c
index c26df38d2..f48125e64 100644
--- a/src/libelogind/sd-bus/bus-message.c
+++ b/src/libelogind/sd-bus/bus-message.c
@@ -3221,7 +3221,6 @@ end:
return 0;
}
-
static int message_peek_body(
sd_bus_message *m,
size_t *rindex,
@@ -5315,7 +5314,6 @@ int bus_message_parse_fields(sd_bus_message *m) {
break;
-
case BUS_MESSAGE_HEADER_SIGNATURE: {
const char *s;
char *c;
diff --git a/src/libelogind/sd-bus/bus-signature.c b/src/libelogind/sd-bus/bus-signature.c
index ab9afdb49..662a1eac5 100644
--- a/src/libelogind/sd-bus/bus-signature.c
+++ b/src/libelogind/sd-bus/bus-signature.c
@@ -96,7 +96,6 @@ static int signature_element_length_internal(
return -EINVAL;
}
-
int signature_element_length(const char *s, size_t *l) {
return signature_element_length_internal(s, true, 0, 0, l);
}
diff --git a/src/libelogind/sd-bus/bus-slot.c b/src/libelogind/sd-bus/bus-slot.c
index 06b9b0edb..3745426c5 100644
--- a/src/libelogind/sd-bus/bus-slot.c
+++ b/src/libelogind/sd-bus/bus-slot.c
@@ -157,7 +157,6 @@ void bus_slot_disconnect(sd_bus_slot *slot) {
key.interface = slot->node_vtable.interface;
key.member = v->x.method.member;
-
x = hashmap_remove(slot->bus->vtable_properties, &key);
break;
}}
diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c
index b0874515e..7b32c3f88 100644
--- a/src/libelogind/sd-bus/sd-bus.c
+++ b/src/libelogind/sd-bus/sd-bus.c
@@ -3692,7 +3692,6 @@ _public_ int sd_bus_default_system(sd_bus **ret) {
return bus_default(sd_bus_open_system, &default_system_bus, ret);
}
-
_public_ int sd_bus_default_user(sd_bus **ret) {
#if 0 /// elogind does not support user buses
return bus_default(sd_bus_open_user, &default_user_bus, ret);
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 39d7a366f..857f43827 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -261,7 +261,6 @@ int session_save(Session *s) {
if (s->desktop) {
_cleanup_free_ char *escaped;
-
escaped = cescape(s->desktop);
if (!escaped) {
r = -ENOMEM;
diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index 314488ab8..5ecc23f6e 100644
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -275,7 +275,6 @@ int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) {
return write_utmp_wtmp(&store, &store_wtmp);
}
-
int utmp_put_runlevel(int runlevel, int previous) {
struct utmpx store = {};
int r;
diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c
index 118720313..0138af7d8 100644
--- a/src/test/test-exec-util.c
+++ b/src/test/test-exec-util.c
@@ -236,7 +236,6 @@ const gather_stdout_callback_t gather_stdout[] = {
gather_stdout_three,
};
-
static void test_stdout_gathering(void) {
char template[] = "/tmp/test-exec-util.XXXXXXX";
const char *dirs[] = {template, NULL};
diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c
index 5008630e0..d26e63346 100644
--- a/src/test/test-locale-util.c
+++ b/src/test/test-locale-util.c
@@ -5,7 +5,6 @@
Copyright 2014 Ronny Chevalier
***/
-
#include "locale-util.h"
#include "macro.h"
#include "strv.h"
diff --git a/src/test/test-parse-util.c b/src/test/test-parse-util.c
index 8209b98c3..e8c12710a 100644
--- a/src/test/test-parse-util.c
+++ b/src/test/test-parse-util.c
@@ -668,7 +668,6 @@ static void test_parse_nice(void) {
assert_se(parse_nice("19", &n) >= 0 && n == 19);
assert_se(parse_nice("+19", &n) >= 0 && n == 19);
-
assert_se(parse_nice("", &n) == -EINVAL);
assert_se(parse_nice("-", &n) == -EINVAL);
assert_se(parse_nice("+", &n) == -EINVAL);
diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c
index d3a98ec66..3d8d911ac 100644
--- a/src/test/test-stat-util.c
+++ b/src/test/test-stat-util.c
@@ -49,7 +49,6 @@ static void test_is_symlink(void) {
assert_se(is_symlink(name_link) == 1);
assert_se(is_symlink("/a/file/which/does/not/exist/i/guess") < 0);
-
unlink(name);
unlink(name_link);
}
diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c
index 48e418f48..97f8fde97 100644
--- a/src/test/test-string-util.c
+++ b/src/test/test-string-util.c
@@ -137,7 +137,6 @@ static void test_strrep(void) {
assert_se(streq(zero, ""));
}
-
static void test_strappend(void) {
_cleanup_free_ char *t1, *t2, *t3, *t4;