From: Vito Caputo Date: Sat, 2 Dec 2017 00:49:52 +0000 (-0800) Subject: *: fix some inconsistent control statement style X-Git-Tag: v236~78^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=508f63b411f6d2176c6948bc86dac14937dfdcf2;p=thirdparty%2Fsystemd.git *: fix some inconsistent control statement style --- diff --git a/src/basic/set.c b/src/basic/set.c index 99f20426993..e554e825ebb 100644 --- a/src/basic/set.c +++ b/src/basic/set.c @@ -39,7 +39,7 @@ int set_make(Set **ret, const struct hash_ops *hash_ops HASHMAP_DEBUG_PARAMS, vo va_start(ap, add); - for(;;) { + for (;;) { void *arg = va_arg(ap, void*); if (!arg) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 220e617699e..035fa8844bc 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -3557,7 +3557,7 @@ int config_parse_device_allow( } r = unit_full_printf(userdata, rvalue, &t); - if(r < 0) { + if (r < 0) { log_syntax(unit, LOG_WARNING, filename, line, r, "Failed to resolve specifiers in %s, ignoring: %m", rvalue); diff --git a/src/login/loginctl.c b/src/login/loginctl.c index f658afa8a21..dfcaff6195d 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -727,7 +727,7 @@ static int print_seat_status_info(sd_bus *bus, const char *path, bool *new_line) printf(fmt "\n", __VA_ARGS__); \ else \ printf("%s=" fmt "\n", name, __VA_ARGS__); \ - } while(0) + } while (0) static int print_property(const char *name, sd_bus_message *m, const char *contents) { int r; diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c index 1755ba1ac2f..99dd416296c 100644 --- a/src/network/networkd-brvlan.c +++ b/src/network/networkd-brvlan.c @@ -142,7 +142,7 @@ static int append_vlan_info_data(Link *const link, sd_netlink_message *req, uint next: i = j; - } while(!done); + } while (!done); } if (!cnt) return -EINVAL; diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 67cdea0b9f9..5b8288fb724 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -3272,7 +3272,7 @@ int link_update(Link *link, sd_netlink_message *m) { ARPHRD_ETHER, (const uint8_t *)&link->mac, sizeof(link->mac)); - if(r < 0) + if (r < 0) return log_link_warning_errno(link, r, "Could not update MAC client id in DHCP client: %m"); break; default: diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 527d2623cae..c2c41d978b8 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -816,7 +816,7 @@ int manager_rtnl_process_rule(sd_netlink *rtnl, sd_netlink_message *message, voi switch (type) { case RTM_NEWRULE: - if(!rule) { + if (!rule) { r = routing_policy_rule_add_foreign(m, family, &from, from_prefixlen, &to, to_prefixlen, tos, fwmark, table, iif, oif, &rule); if (r < 0) { log_warning_errno(r, "Could not add rule: %m"); diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c index b44ab00bb5c..898d5b3c364 100644 --- a/src/resolve/resolved-dns-rr.c +++ b/src/resolve/resolved-dns-rr.c @@ -1571,7 +1571,7 @@ DnsResourceRecord *dns_resource_record_copy(DnsResourceRecord *rr) { return NULL; copy->hinfo.os = strdup(rr->hinfo.os); - if(!copy->hinfo.os) + if (!copy->hinfo.os) return NULL; break; diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index 8a07318455c..cfd4c833b0b 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -1247,7 +1247,7 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen done = true; break; } - } while(!done); + } while (!done); if (explicit_path) { r = extract_first_word(&eq, &path, NULL, EXTRACT_QUOTES|EXTRACT_CUNESCAPE); diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 7d5ea0c0acf..7a185461a3e 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -660,7 +660,7 @@ int bus_connect_user_systemd(sd_bus **_bus) { printf(fmt "\n", __VA_ARGS__); \ else \ printf("%s=" fmt "\n", name, __VA_ARGS__); \ - } while(0) + } while (0) int bus_print_property(const char *name, sd_bus_message *property, bool value, bool all) { char type; diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index e121d580cff..33fbaf99501 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -4779,7 +4779,7 @@ skip: printf(fmt "\n", __VA_ARGS__); \ else \ printf("%s=" fmt "\n", name, __VA_ARGS__); \ - } while(0) + } while (0) static int print_property(const char *name, sd_bus_message *m, const char *contents) { int r;