tree-wide: remove some spurious newlines
Specifically, remove double newlines, and newlines before '}'.
This commit is contained in:
committed by
Luca Boccassi
parent
bc996fd1ba
commit
5dc89b327f
@@ -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;
|
||||
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -42,5 +42,4 @@ static inline bool FILE_SIZE_VALID_OR_INFINITY(uint64_t l) {
|
||||
return true;
|
||||
|
||||
return FILE_SIZE_VALID(l);
|
||||
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -41,5 +41,4 @@ int config_parse_default_file_system_type(
|
||||
}
|
||||
|
||||
return free_and_strdup_warn(s, empty_to_null(rvalue));
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -222,7 +222,6 @@ static void test_dhcp_hostname_shorten_overlong(void) {
|
||||
assert_se(r == -EDOM);
|
||||
assert_se(shortened == NULL);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
int main(void) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -412,5 +412,4 @@ int manager_parse_config_file(Manager *m) {
|
||||
}
|
||||
#endif
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
|
||||
@@ -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[]) {
|
||||
|
||||
@@ -113,7 +113,6 @@ bool cg_is_unified_wanted(void) {
|
||||
return (wanted = false);
|
||||
|
||||
return (wanted = true);
|
||||
|
||||
}
|
||||
|
||||
bool cg_is_legacy_wanted(void) {
|
||||
|
||||
@@ -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 },
|
||||
{}
|
||||
|
||||
@@ -368,5 +368,4 @@ int group_record_match(GroupRecord *h, const UserDBMatch *match) {
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -928,7 +928,6 @@ TEST(config_parse_memory_limit) {
|
||||
assert_se(r >= 0);
|
||||
assert_se(*test->result == test->expected);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
TEST(contains_instance_specifier_superset) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@ typedef struct XdgAutostartService {
|
||||
|
||||
bool hidden;
|
||||
bool systemd_skip;
|
||||
|
||||
} XdgAutostartService;
|
||||
|
||||
XdgAutostartService * xdg_autostart_service_free(XdgAutostartService *s);
|
||||
|
||||
Reference in New Issue
Block a user