From: Nick Rosbrook <enr0n@ubuntu.com>
Date: Wed, 29 Jan 2025 13:57:44 +0000 (-0500)
Subject: tree-wide: remove some spurious newlines
X-Git-Tag: v258-rc1~1454
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5dc89b327f2361c2a8a43c74871ae5bdd6a6c814;p=thirdparty%2Fsystemd.git

tree-wide: remove some spurious newlines

Specifically, remove double newlines, and newlines before '}'.
---

diff --git a/src/basic/format-util.c b/src/basic/format-util.c
index 09cb716e7d1..079b32c04db 100644
--- a/src/basic/format-util.c
+++ b/src/basic/format-util.c
@@ -62,5 +62,4 @@ char* format_bytes_full(char *buf, size_t l, uint64_t t, FormatBytesFlag flag) {
 finish:
         buf[l-1] = 0;
         return buf;
-
 }
diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c
index fa28d79dcbe..f1f3a195c08 100644
--- a/src/basic/in-addr-util.c
+++ b/src/basic/in-addr-util.c
@@ -942,7 +942,6 @@ int in_addr_prefix_from_string_auto_full(
                 *ret_prefixlen = k;
 
         return 0;
-
 }
 
 void in_addr_hash_func(const union in_addr_union *u, int family, struct siphash *state) {
diff --git a/src/basic/io-util.h b/src/basic/io-util.h
index e027c1a878c..df24e85b06f 100644
--- a/src/basic/io-util.h
+++ b/src/basic/io-util.h
@@ -42,5 +42,4 @@ static inline bool FILE_SIZE_VALID_OR_INFINITY(uint64_t l) {
                 return true;
 
         return FILE_SIZE_VALID(l);
-
 }
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 1a0c51fe72f..07e7abe7428 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -3100,7 +3100,6 @@ static int make_tmp_prefix(const char *prefix) {
         }
 
         return 0;
-
 }
 
 static int setup_one_tmp_dir(const char *id, const char *prefix, char **path, char **tmp_path) {
diff --git a/src/core/swap.c b/src/core/swap.c
index f2d1d5608cd..28afba37901 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -617,7 +617,6 @@ static void swap_dump(Unit *u, FILE *f, const char *prefix) {
 
                 exec_command_dump(s->exec_command + c, f, prefix2);
         }
-
 }
 
 static int swap_spawn(Swap *s, ExecCommand *c, PidRef *ret_pid) {
diff --git a/src/home/homed-conf.c b/src/home/homed-conf.c
index 21cb5106881..87b3e8cd845 100644
--- a/src/home/homed-conf.c
+++ b/src/home/homed-conf.c
@@ -41,5 +41,4 @@ int config_parse_default_file_system_type(
         }
 
         return free_and_strdup_warn(s, empty_to_null(rvalue));
-
 }
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index f039a33ad28..30a77377127 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -999,5 +999,4 @@ void stdout_stream_send_notify(StdoutStream *s) {
 
         LIST_REMOVE(stdout_stream_notify_queue, s->server->stdout_streams_notify_queue, s);
         s->in_notify_queue = false;
-
 }
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 7a899669126..5d733baa571 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -1383,7 +1383,6 @@ static int client_initialize_time_events(sd_dhcp_client *client) {
                 client_stop(client, r);
 
         return 0;
-
 }
 
 static int client_initialize_events(sd_dhcp_client *client, sd_event_io_handler_t io_callback) {
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index c8962e4cc06..808d52f876d 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -4384,7 +4384,6 @@ static int bus_message_get_arg_skip(
                 if (r < 0)
                         return r;
         }
-
 }
 
 int bus_message_get_arg(sd_bus_message *m, unsigned i, const char **str) {
diff --git a/src/libsystemd/sd-journal/test-journal-interleaving.c b/src/libsystemd/sd-journal/test-journal-interleaving.c
index 211d8c9dc06..1000df76804 100644
--- a/src/libsystemd/sd-journal/test-journal-interleaving.c
+++ b/src/libsystemd/sd-journal/test-journal-interleaving.c
@@ -142,7 +142,6 @@ static void test_check_numbers_up(sd_journal *j, unsigned count) {
                 else
                         ASSERT_OK_POSITIVE(sd_journal_previous(j));
         }
-
 }
 
 static void setup_sequential(void) {
diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c
index fbf87091a36..644051d844c 100644
--- a/src/network/networkd-radv.c
+++ b/src/network/networkd-radv.c
@@ -397,7 +397,6 @@ set_domains:
                         s,
                         link->network->router_dns_lifetime_usec,
                         /* valid_until = */ USEC_INFINITY);
-
 }
 
 static int radv_find_uplink(Link *link, Link **ret) {
diff --git a/src/network/test-network.c b/src/network/test-network.c
index 5f3b4c0b311..89dd98f560e 100644
--- a/src/network/test-network.c
+++ b/src/network/test-network.c
@@ -222,7 +222,6 @@ static void test_dhcp_hostname_shorten_overlong(void) {
                 assert_se(r == -EDOM);
                 assert_se(shortened == NULL);
         }
-
 }
 
 int main(void) {
diff --git a/src/path/path.c b/src/path/path.c
index 6ca2bd8c388..18a88e1c69e 100644
--- a/src/path/path.c
+++ b/src/path/path.c
@@ -111,7 +111,6 @@ static const char* const path_table[_SD_PATH_MAX] = {
         [SD_PATH_USER_SEARCH_CREDENTIAL_STORE]                = "user-search-credential-store",
         [SD_PATH_USER_CREDENTIAL_STORE_ENCRYPTED]             = "user-credential-store-encrypted",
         [SD_PATH_USER_SEARCH_CREDENTIAL_STORE_ENCRYPTED]      = "user-search-credential-store-encrypted",
-
 };
 
 static int order_cmp(const size_t *a, const size_t *b) {
diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c
index 9d70d98d1d4..57200307795 100644
--- a/src/resolve/resolved-conf.c
+++ b/src/resolve/resolved-conf.c
@@ -412,5 +412,4 @@ int manager_parse_config_file(Manager *m) {
         }
 #endif
         return 0;
-
 }
diff --git a/src/resolve/resolved-varlink.c b/src/resolve/resolved-varlink.c
index 02e00eef7da..e5fdc34659d 100644
--- a/src/resolve/resolved-varlink.c
+++ b/src/resolve/resolved-varlink.c
@@ -1399,7 +1399,6 @@ fail:
         if (set_isempty(m->varlink_dns_configuration_subscription))
                 manager_stop_dns_configuration_monitor(m);
 
-
         return log_debug_errno(r, "Failed to subscribe client to DNS configuration monitor: %m");
 }
 
diff --git a/src/resolve/test-dnssec-complex.c b/src/resolve/test-dnssec-complex.c
index 05a5f07aadc..30f49a780be 100644
--- a/src/resolve/test-dnssec-complex.c
+++ b/src/resolve/test-dnssec-complex.c
@@ -93,7 +93,6 @@ static void test_hostname_lookup(sd_bus *bus, const char *name, int family, cons
                 assert_se(!result);
                 log_info("[OK] %s/%s succeeded.", name, af);
         }
-
 }
 
 int main(int argc, char* argv[]) {
diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
index 49d40f60d85..0153454b982 100644
--- a/src/shared/cgroup-setup.c
+++ b/src/shared/cgroup-setup.c
@@ -113,7 +113,6 @@ bool cg_is_unified_wanted(void) {
                 return (wanted = false);
 
         return (wanted = true);
-
 }
 
 bool cg_is_legacy_wanted(void) {
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index e4ae8947821..92b73815098 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -3841,7 +3841,6 @@ int dissect_loop_device_and_warn(
                         dissect_loop_device(loop, verity, mount_options, image_policy, flags, ret),
                         loop->backing_file ?: loop->node,
                         verity);
-
 }
 
 bool dissected_image_verity_candidate(const DissectedImage *image, PartitionDesignator partition_designator) {
@@ -4469,7 +4468,6 @@ int mountfsd_mount_directory(
         if (!isempty(error_id))
                 return log_error_errno(sd_varlink_error_to_errno(error_id, reply), "Failed to call MountDirectory() varlink call: %s", error_id);
 
-
         static const sd_json_dispatch_field dispatch_table[] = {
                 { "mountFileDescriptor", _SD_JSON_VARIANT_TYPE_INVALID, sd_json_dispatch_uint, 0, SD_JSON_MANDATORY },
                 {}
diff --git a/src/shared/group-record.c b/src/shared/group-record.c
index 6d696bdaaa3..911c6c8f0bc 100644
--- a/src/shared/group-record.c
+++ b/src/shared/group-record.c
@@ -368,5 +368,4 @@ int group_record_match(GroupRecord *h, const UserDBMatch *match) {
         }
 
         return true;
-
 }
diff --git a/src/ssh-generator/ssh-proxy.c b/src/ssh-generator/ssh-proxy.c
index 0085e2a0872..94ba3d95ac0 100644
--- a/src/ssh-generator/ssh-proxy.c
+++ b/src/ssh-generator/ssh-proxy.c
@@ -47,7 +47,6 @@ static int process_vsock_cid(unsigned cid, const char *port) {
 
         log_debug("Successfully sent AF_VSOCK socket via STDOUT.");
         return 0;
-
 }
 
 static int process_vsock_string(const char *host, const char *port) {
diff --git a/src/sysupdate/sysupdate-feature.c b/src/sysupdate/sysupdate-feature.c
index 05c1924d353..4b811ac3511 100644
--- a/src/sysupdate/sysupdate-feature.c
+++ b/src/sysupdate/sysupdate-feature.c
@@ -78,7 +78,6 @@ static int config_parse_url_specifiers(
         return free_and_replace(*s, resolved);
 }
 
-
 int feature_read_definition(Feature *f, const char *path, const char *const *dirs) {
         assert(f);
 
diff --git a/src/test/test-argv-util.c b/src/test/test-argv-util.c
index f7b8f9478b9..4a3ac700ac5 100644
--- a/src/test/test-argv-util.c
+++ b/src/test/test-argv-util.c
@@ -126,7 +126,6 @@ TEST(argv_help) {
         assert_se(argv_looks_like_help(5, STRV_MAKE("program", "--help", "arg1", "-h", "--help")));
         assert_se(!argv_looks_like_help(4, STRV_MAKE("program","arg1", "arg2", "-H")));
         assert_se(!argv_looks_like_help(3, STRV_MAKE("program", "--Help", "arg2")));
-
 }
 
 static int intro(void) {
diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c
index 67a618009de..93223be29de 100644
--- a/src/test/test-firewall-util.c
+++ b/src/test/test-firewall-util.c
@@ -43,7 +43,6 @@ static void test_v6(FirewallContext *ctx) {
 
         ASSERT_OK(fw_add_local_dnat(&ctx, true, AF_INET6, IPPROTO_TCP, 4711, &u2, 815, &u1));
         ASSERT_OK(fw_add_local_dnat(&ctx, false, AF_INET6, IPPROTO_TCP, 4711, &u2, 815, NULL));
-
 }
 
 static union in_addr_union *parse_addr(const char *str, union in_addr_union *u) {
diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c
index 038165aa176..8883c4e4fc8 100644
--- a/src/test/test-load-fragment.c
+++ b/src/test/test-load-fragment.c
@@ -928,7 +928,6 @@ TEST(config_parse_memory_limit) {
                 assert_se(r >= 0);
                 assert_se(*test->result == test->expected);
         }
-
 }
 
 TEST(contains_instance_specifier_superset) {
diff --git a/src/test/test-parse-helpers.c b/src/test/test-parse-helpers.c
index 20d4c2f5545..e63b4df4eb8 100644
--- a/src/test/test-parse-helpers.c
+++ b/src/test/test-parse-helpers.c
@@ -125,7 +125,6 @@ TEST(path_simplify_and_warn) {
         assert_se(test_path_simplify_and_warn_one("/aaaa", "/aaaa", 0) == 0);
         assert_se(test_path_simplify_and_warn_one("/aaaa", "/aaaa", PATH_CHECK_ABSOLUTE) == 0);
         assert_se(test_path_simplify_and_warn_one("/aaaa", "/aaaa", PATH_CHECK_RELATIVE) == -EINVAL);
-
 }
 
 DEFINE_TEST_MAIN(LOG_INFO);
diff --git a/src/test/test-serialize.c b/src/test/test-serialize.c
index 40abf6cdcf6..755aa9d869a 100644
--- a/src/test/test-serialize.c
+++ b/src/test/test-serialize.c
@@ -205,7 +205,6 @@ TEST(serialize_item_hexmem) {
         _cleanup_free_ char *line = NULL;
         assert_se(read_line(f, LONG_LINE_MAX, &line) > 0);
         ASSERT_STREQ(line, "a=ffffff");
-
 }
 
 TEST(serialize_item_base64mem) {
diff --git a/src/test/test-varlink-idl.c b/src/test/test-varlink-idl.c
index 41dbfbdb5bc..9de50641e61 100644
--- a/src/test/test-varlink-idl.c
+++ b/src/test/test-varlink-idl.c
@@ -223,7 +223,6 @@ TEST(parse) {
                                     "type Foo (b: bool, c: foo, c: int)", NULL, NULL, NULL) == -ENETUNREACH); /* unresolved type */
         assert_se(varlink_idl_parse("interface org.freedesktop.Foo\n"
                                     "type Foo ()", NULL, NULL, NULL) == -EBADMSG); /* empty struct/enum */
-
 }
 
 TEST(interface_name_is_valid) {
diff --git a/src/test/test-varlink.c b/src/test/test-varlink.c
index 0708ec1446f..649433b3d55 100644
--- a/src/test/test-varlink.c
+++ b/src/test/test-varlink.c
@@ -454,7 +454,6 @@ TEST(invalid_parameter) {
                                       SD_JSON_BUILD_PAIR_STRING("iexist", "foo"),
                                       SD_JSON_BUILD_PAIR_STRING("idontexist", "bar")) >= 0);
 
-
         assert_se(sd_event_loop(e) >= 0);
 }
 
diff --git a/src/xdg-autostart-generator/xdg-autostart-service.h b/src/xdg-autostart-generator/xdg-autostart-service.h
index 15a29da1bea..390670eedea 100644
--- a/src/xdg-autostart-generator/xdg-autostart-service.h
+++ b/src/xdg-autostart-generator/xdg-autostart-service.h
@@ -23,7 +23,6 @@ typedef struct XdgAutostartService {
 
         bool hidden;
         bool systemd_skip;
-
 } XdgAutostartService;
 
 XdgAutostartService * xdg_autostart_service_free(XdgAutostartService *s);