From 7d6884b65e6ea7317346d29bc2f6c9ba051a0cac Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Thu, 6 Aug 2015 00:31:09 +0200 Subject: tree-wide: fix indentation --- src/core/dbus-cgroup.c | 4 ++-- src/core/execute.c | 2 +- src/libsystemd/sd-bus/bus-kernel.c | 4 +++- src/locale/localectl.c | 6 +++--- src/network/networkctl.c | 2 +- src/network/networkd-dhcp4.c | 6 +++--- src/network/networkd-manager.c | 4 +++- src/shared/bus-util.c | 4 ++-- src/test/test-strv.c | 4 ++-- src/tmpfiles/tmpfiles.c | 4 ++-- src/udev/udev-rules.c | 2 +- 11 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c index 4a9df06016..9dcc51f240 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -433,9 +433,9 @@ int bus_cgroup_set_property( if (!f) return -ENOMEM; - if (read) { + if (read) { fputs("BlockIOReadBandwidth=\n", f); - LIST_FOREACH(device_bandwidths, a, c->blockio_device_bandwidths) + LIST_FOREACH(device_bandwidths, a, c->blockio_device_bandwidths) if (a->read) fprintf(f, "BlockIOReadBandwidth=%s %" PRIu64 "\n", a->path, a->bandwidth); } else { diff --git a/src/core/execute.c b/src/core/execute.c index f14ae4d8a6..125cb0dbd4 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -2211,7 +2211,7 @@ int exec_context_load_environment(Unit *unit, const ExecContext *c, char ***l) { static bool tty_may_match_dev_console(const char *tty) { _cleanup_free_ char *active = NULL; - char *console; + char *console; if (startswith(tty, "/dev/")) tty += 5; diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index 6ac5ebc3da..d72535b8bc 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -212,7 +212,9 @@ static int bus_message_setup_bloom(sd_bus_message *m, struct kdbus_bloom_filter return r; add_bloom_arg(data, m->bus->bloom_size, m->bus->bloom_n_hash, i, t); - } if (type == SD_BUS_TYPE_ARRAY && STR_IN_SET(contents, "s", "o", "g")) { + } + + if (type == SD_BUS_TYPE_ARRAY && STR_IN_SET(contents, "s", "o", "g")) { /* As well as array of simple strings of any kinds */ r = sd_bus_message_enter_container(m, type, contents); diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 3616f4af1f..1e06f2251c 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -467,9 +467,9 @@ static int list_x11_keymaps(sd_bus *bus, char **args, unsigned n) { } else *w = 0; - r = strv_extend(&list, l); - if (r < 0) - return log_oom(); + r = strv_extend(&list, l); + if (r < 0) + return log_oom(); } if (strv_isempty(list)) { diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 6c36a4ecfa..c9b53dc3f6 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -227,7 +227,7 @@ static int list_links(int argc, char *argv[], void *userdata) { _cleanup_device_unref_ sd_device *d = NULL; const char *on_color_operational, *off_color_operational, *on_color_setup, *off_color_setup; - char devid[2 + DECIMAL_STR_MAX(int)]; + char devid[2 + DECIMAL_STR_MAX(int)]; _cleanup_free_ char *t = NULL; sd_network_link_get_operational_state(links[i].ifindex, &operational_state); diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 5454bdd97b..6288644a1a 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -248,7 +248,7 @@ static int dhcp_lease_lost(Link *link) { address->in_addr.in = addr; address->prefixlen = prefixlen; - address_drop(address, link, &link_address_drop_handler); + address_drop(address, link, &link_address_drop_handler); } } @@ -620,8 +620,8 @@ int dhcp4_configure(Link *link) { return r; r = sd_dhcp_client_set_request_option(link->dhcp_client, DHCP_OPTION_CLASSLESS_STATIC_ROUTE); - if (r < 0) - return r; + if (r < 0) + return r; } if (link->network->dhcp_sendhost) { diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index e718c4840a..09a929e0da 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -145,7 +145,9 @@ int manager_connect_bus(Manager *m) { return log_error_errno(r, "Failed to install bus reconnect time event: %m"); return 0; - } if (r < 0) + } + + if (r < 0) return r; r = sd_bus_add_match(m->bus, &m->prepare_for_sleep_slot, diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 11350dad71..aa87cd0910 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -972,8 +972,8 @@ static int map_basic(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_ } case SD_BUS_TYPE_ARRAY: { - _cleanup_strv_free_ char **l = NULL; - char ***p = userdata; + _cleanup_strv_free_ char **l = NULL; + char ***p = userdata; r = bus_message_read_strv_extend(m, &l); if (r < 0) diff --git a/src/test/test-strv.c b/src/test/test-strv.c index d5ea2b3fab..6e3c81395c 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -307,7 +307,7 @@ static void test_strv_sort(void) { } static void test_strv_extend_strv_concat(void) { - _cleanup_strv_free_ char **a = NULL, **b = NULL; + _cleanup_strv_free_ char **a = NULL, **b = NULL; a = strv_new("without", "suffix", NULL); b = strv_new("with", "suffix", NULL); @@ -323,7 +323,7 @@ static void test_strv_extend_strv_concat(void) { } static void test_strv_extend_strv(void) { - _cleanup_strv_free_ char **a = NULL, **b = NULL; + _cleanup_strv_free_ char **a = NULL, **b = NULL; a = strv_new("abc", "def", "ghi", NULL); b = strv_new("jkl", "mno", "pqr", NULL); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 271984b5a8..d6f7801561 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -616,7 +616,7 @@ static int path_set_perms(Item *i, const char *path) { if (!(st.st_mode & 0111)) m &= ~0111; if (!(st.st_mode & 0222)) - m &= ~0222; + m &= ~0222; if (!(st.st_mode & 0444)) m &= ~0444; if (!S_ISDIR(st.st_mode)) @@ -641,7 +641,7 @@ static int path_set_perms(Item *i, const char *path) { if (chown(fn, i->uid_set ? i->uid : UID_INVALID, i->gid_set ? i->gid : GID_INVALID) < 0) - return log_error_errno(errno, "chown(%s) failed: %m", path); + return log_error_errno(errno, "chown(%s) failed: %m", path); } } diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 368da9b1ae..43255fb9d4 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -2125,7 +2125,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, rule->rule.filename_line); /* return the result from earlier run */ if (event->builtin_ret & (1 << cur->key.builtin_cmd)) - if (cur->key.op != OP_NOMATCH) + if (cur->key.op != OP_NOMATCH) goto nomatch; break; } -- cgit v1.2.3-54-g00ecf