Merge pull request #7529 from vcaputo/trivial-style-fixups

*: fix some inconsistent control statement style
This commit is contained in:
Vito Caputo 2017-12-01 16:53:38 -08:00 committed by GitHub
commit 1ff8b31d9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 10 additions and 10 deletions

View File

@ -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)

View File

@ -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);

View File

@ -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;

View File

@ -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;

View File

@ -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:

View File

@ -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");

View File

@ -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;

View File

@ -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);

View File

@ -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;

View File

@ -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;