picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7453 from neosilky/coccinelle-fixes

Browse source 
Applied fixes from Coccinelle
This commit is contained in:
Lennart Poettering 2017-11-24 13:29:48 +01:00 committed by GitHub
parent e92b78b561 95333b2bed
commit f170504825
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/basic/cgroup-util.c
View file

@ -2092,8 +2092,7 @@ int cg_get_keyed_attribute(const char *controller, const char *path, const char
for (i = 0; keys[i]; i++) { for (i = 0; keys[i]; i++) {
if (!values[i]) { if (!values[i]) {
for (i = 0; keys[i]; i++) { for (i = 0; keys[i]; i++) {
free(values[i]); values[i] = mfree(values[i]);
values[i] = NULL;
} }
return -ENOENT; return -ENOENT;
} }

8
src/network/networkd-manager.c
View file

@ -606,7 +606,7 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
case RTM_NEWADDR: case RTM_NEWADDR:
if (address) if (address)
log_link_debug(link, "Updating address: %s/%u (valid %s%s)", buf, prefixlen, log_link_debug(link, "Updating address: %s/%u (valid %s%s)", buf, prefixlen,
valid_str ? "for " : "forever", valid_str ?: ""); valid_str ? "for " : "forever", strempty(valid_str));
else { else {
/* An address appeared that we did not request */ /* An address appeared that we did not request */
r = address_add_foreign(link, family, &in_addr, prefixlen, &address); r = address_add_foreign(link, family, &in_addr, prefixlen, &address);
@ -615,7 +615,7 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
return 0; return 0;
} else } else
log_link_debug(link, "Adding address: %s/%u (valid %s%s)", buf, prefixlen, log_link_debug(link, "Adding address: %s/%u (valid %s%s)", buf, prefixlen,
valid_str ? "for " : "forever", valid_str ?: ""); valid_str ? "for " : "forever", strempty(valid_str));
} }
address_update(address, flags, scope, &cinfo); address_update(address, flags, scope, &cinfo);
@ -626,11 +626,11 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
if (address) { if (address) {
log_link_debug(link, "Removing address: %s/%u (valid %s%s)", buf, prefixlen, log_link_debug(link, "Removing address: %s/%u (valid %s%s)", buf, prefixlen,
valid_str ? "for " : "forever", valid_str ?: ""); valid_str ? "for " : "forever", strempty(valid_str));
address_drop(address); address_drop(address);
} else } else
log_link_warning(link, "Removing non-existent address: %s/%u (valid %s%s)", buf, prefixlen, log_link_warning(link, "Removing non-existent address: %s/%u (valid %s%s)", buf, prefixlen,
valid_str ? "for " : "forever", valid_str ?: ""); valid_str ? "for " : "forever", strempty(valid_str));
break; break;
default: default:

4
src/nspawn/nspawn-mount.c
View file

@ -368,7 +368,7 @@ static int tmpfs_patch_options(
assert(uid_shift != UID_INVALID); assert(uid_shift != UID_INVALID);
if (asprintf(&buf, "%s%suid=" UID_FMT ",gid=" UID_FMT, if (asprintf(&buf, "%s%suid=" UID_FMT ",gid=" UID_FMT,
options ?: "", options ? "," : "", strempty(options), options ? "," : "",
uid_shift, uid_shift) < 0) uid_shift, uid_shift) < 0)
return -ENOMEM; return -ENOMEM;
@ -379,7 +379,7 @@ static int tmpfs_patch_options(
if (selinux_apifs_context) { if (selinux_apifs_context) {
char *t; char *t;
t = strjoin(options ?: "", options ? "," : "", t = strjoin(strempty(options), options ? "," : "",
"context=\"", selinux_apifs_context, "\""); "context=\"", selinux_apifs_context, "\"");
free(buf); free(buf);
if (!t) if (!t)

4
src/resolve/resolved-dns-rr.c
View file

@ -335,8 +335,8 @@ char* dns_resource_key_to_string(const DnsResourceKey *key, char *buf, size_t bu
snprintf(buf, buf_size, "%s %s%s%.0u %s%s%.0u", snprintf(buf, buf_size, "%s %s%s%.0u %s%s%.0u",
dns_resource_key_name(key), dns_resource_key_name(key),
c ?: "", c ? "" : "CLASS", c ? 0 : key->class, strempty(c), c ? "" : "CLASS", c ? 0 : key->class,
t ?: "", t ? "" : "TYPE", t ? 0 : key->class); strempty(t), t ? "" : "TYPE", t ? 0 : key->class);
return ans; return ans;
} }

2
src/shared/install-printf.c
View file

@ -94,7 +94,7 @@ static int specifier_instance(char specifier, void *data, void *userdata, char *
return r; return r;
if (isempty(instance)) { if (isempty(instance)) {
r = free_and_strdup(&instance, i->default_instance ?: ""); r = free_and_strdup(&instance, strempty(i->default_instance));
if (r < 0) if (r < 0)
return r; return r;
} }