summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-04-19 12:13:23 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-04-19 12:13:23 +0200
commit5d13a15b1d0bd7d218100d204a84eaaaaeab932f (patch)
tree08d1ba916131ac128453713792cd8498b556de3a /src/basic
parent6360b8ff8383bb69978e6278298b4a2bef329f25 (diff)
downloadsystemd-5d13a15b1d0bd7d218100d204a84eaaaaeab932f.tar.gz
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/basic')
-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/ratelimit.c1
-rw-r--r--src/basic/selinux-util.c1
-rw-r--r--src/basic/socket-util.c2
7 files changed, 0 insertions, 8 deletions
diff --git a/src/basic/format-table.c b/src/basic/format-table.c
index 36873fd397..ae2c6238c4 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 b62f2bd877..13e357efd4 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 7c36d78cc6..a6efbc3a7b 100644
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -856,7 +856,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 5095cee91b..1623932f18 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/ratelimit.c b/src/basic/ratelimit.c
index 5e096b8f99..6598b1a812 100644
--- a/src/basic/ratelimit.c
+++ b/src/basic/ratelimit.c
@@ -5,7 +5,6 @@
Copyright 2010 Lennart Poettering
***/
-
#include <sys/time.h>
#include "macro.h"
diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
index 6f370f9cba..aba3e4f15d 100644
--- a/src/basic/selinux-util.c
+++ b/src/basic/selinux-util.c
@@ -315,7 +315,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 7766229822..95a79f7b53 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -664,7 +664,6 @@ int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_
return -EOPNOTSUPP;
}
-
*ret = p;
return 0;
}
@@ -1127,7 +1126,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 (;;) {