From 8e1e87a5dee17e6ed9236f9d1a8c27f925e0e3fd Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 1 Nov 2019 18:33:24 +0900 Subject: tree-wide: drop double newline --- src/basic/format-util.c | 1 - src/basic/login-util.c | 1 - src/busctl/busctl.c | 2 -- src/core/swap.c | 2 -- src/libsystemd/sd-netlink/generic-netlink.c | 1 - src/network/networkctl.c | 1 - src/network/networkd-link.h | 1 - src/shared/cgroup-setup.c | 1 - src/shared/efi-loader.c | 1 - src/shared/ethtool-util.c | 1 - src/shared/ethtool-util.h | 1 - src/systemctl/systemctl.c | 1 - src/test/test-calendarspec.c | 1 - src/test/test-date.c | 1 - src/test/test-env-util.c | 1 - src/test/test-strv.c | 1 - src/test/test-unit-file.c | 1 - 17 files changed, 19 deletions(-) diff --git a/src/basic/format-util.c b/src/basic/format-util.c index 1a73225951..b4144e0352 100644 --- a/src/basic/format-util.c +++ b/src/basic/format-util.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ - #include "format-util.h" #include "memory-util.h" #include "stdio-util.h" diff --git a/src/basic/login-util.c b/src/basic/login-util.c index 5c8e557c88..9313926d5a 100644 --- a/src/basic/login-util.c +++ b/src/basic/login-util.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ - #include "login-util.h" #include "string-util.h" diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c index 8475c5bfdd..3ed8f21c96 100644 --- a/src/busctl/busctl.c +++ b/src/busctl/busctl.c @@ -342,8 +342,6 @@ static int list_bus_names(int argc, char **argv, void *userdata) { if (r < 0) return log_error_errno(r, "Failed to show table: %m"); - - return 0; } diff --git a/src/core/swap.c b/src/core/swap.c index c184afa29d..e4b018616d 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -727,7 +727,6 @@ static void swap_enter_signal(Swap *s, SwapState state, SwapResult f) { if (s->result == SWAP_SUCCESS) s->result = f; - r = unit_kill_context(UNIT(s), &s->kill_context, state_to_kill_operation(s, state), @@ -929,7 +928,6 @@ static int swap_stop(Unit *u) { swap_enter_signal(s, SWAP_DEACTIVATING_SIGKILL, SWAP_SUCCESS); return 0; - default: assert_not_reached("Unexpected state."); } diff --git a/src/libsystemd/sd-netlink/generic-netlink.c b/src/libsystemd/sd-netlink/generic-netlink.c index 2576f4831d..b4971da323 100644 --- a/src/libsystemd/sd-netlink/generic-netlink.c +++ b/src/libsystemd/sd-netlink/generic-netlink.c @@ -99,7 +99,6 @@ static int lookup_id(sd_netlink *nl, sd_genl_family family, uint16_t *id) { return 0; } - r = sd_genl_message_new(nl, SD_GENL_ID_CTRL, CTRL_CMD_GETFAMILY, &req); if (r < 0) return r; diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 5a8740883b..a43a179cbf 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -1812,7 +1812,6 @@ static int link_renew(int argc, char *argv[], void *userdata) { return k; } - static int verb_reload(int argc, char *argv[], void *userdata) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index 0b62326024..c8b8241ff1 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.h @@ -145,7 +145,6 @@ typedef struct Link { struct rtnl_link_stats64 stats_old, stats_new; bool stats_updated; - /* All kinds of DNS configuration */ struct in_addr_data *dns; unsigned n_dns; diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c index ddcd156801..e8398cbde5 100644 --- a/src/shared/cgroup-setup.c +++ b/src/shared/cgroup-setup.c @@ -149,7 +149,6 @@ int cg_blkio_weight_parse(const char *s, uint64_t *ret) { return 0; } - static int trim_cb(const char *path, const struct stat *sb, int typeflag, struct FTW *ftwbuf) { assert(path); assert(sb); diff --git a/src/shared/efi-loader.c b/src/shared/efi-loader.c index 46e187000f..3d1df09907 100644 --- a/src/shared/efi-loader.c +++ b/src/shared/efi-loader.c @@ -181,7 +181,6 @@ int efi_set_reboot_to_firmware(bool value) { return 0; } - static ssize_t utf16_size(const uint16_t *s, size_t buf_len_bytes) { size_t l = 0; diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c index e29b81f132..8fec1a83f0 100644 --- a/src/shared/ethtool-util.c +++ b/src/shared/ethtool-util.c @@ -411,7 +411,6 @@ int ethtool_set_nic_buffer_size(int *fd, const char *ifname, netdev_ring_param * return 0; } - static int get_stringset(int fd, struct ifreq *ifr, int stringset_id, struct ethtool_gstrings **gstrings) { _cleanup_free_ struct ethtool_gstrings *strings = NULL; struct { diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h index 5dd7800852..d408bcd90a 100644 --- a/src/shared/ethtool-util.h +++ b/src/shared/ethtool-util.h @@ -87,7 +87,6 @@ typedef struct netdev_ring_param { bool tx_pending_set; } netdev_ring_param; - int ethtool_get_driver(int *fd, const char *ifname, char **ret); int ethtool_get_link_info(int *fd, const char *ifname, int *ret_autonegotiation, size_t *ret_speed, diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 257b6d9f12..b2dafd731b 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -804,7 +804,6 @@ static int expand_names(sd_bus *bus, char **names, const char* suffix, char ***r return 0; } - static int list_units(int argc, char *argv[], void *userdata) { _cleanup_free_ UnitInfo *unit_infos = NULL; _cleanup_(message_set_freep) Set *replies = NULL; diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c index 07987996c7..899e4b5d27 100644 --- a/src/test/test-calendarspec.c +++ b/src/test/test-calendarspec.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ - #include "alloc-util.h" #include "calendarspec.h" #include "errno-util.h" diff --git a/src/test/test-date.c b/src/test/test-date.c index 6c6efc349a..7d27cfa703 100644 --- a/src/test/test-date.c +++ b/src/test/test-date.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ - #include "alloc-util.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c index cb4ee7a576..f0ffe89729 100644 --- a/src/test/test-env-util.c +++ b/src/test/test-env-util.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ - #include "env-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/test/test-strv.c b/src/test/test-strv.c index bc61fc9201..f31ea6f8c6 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ - #include "alloc-util.h" #include "escape.h" #include "nulstr-util.h" diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index f0186b078f..6021164739 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -56,7 +56,6 @@ static void test_unit_file_build_name_map(char **ids) { if (r == 0) log_debug("Cache rebuild skipped based on mtime."); - char **id; STRV_FOREACH(id, ids) { const char *fragment, *name; -- cgit v1.2.1