diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2020-04-21 20:23:33 +0200 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2020-04-21 23:21:04 +0200 |
| commit | e4ff03935c800b91e6919afef7515f318f9f697c (patch) | |
| tree | 00cb680dfb86a4768ff8e02c65ebbf0abb3e0381 /src | |
| parent | 33b58dfb41a0c0db8110f1fc6dd0fc54e0d9cd4a (diff) | |
| download | systemd-e4ff03935c800b91e6919afef7515f318f9f697c.tar.gz | |
tree-wide: formatting tweaks reported by Coccinelle
Diffstat (limited to 'src')
| -rw-r--r-- | src/home/homework.c | 7 | ||||
| -rw-r--r-- | src/libsystemd-network/sd-dhcp-lease.c | 4 | ||||
| -rw-r--r-- | src/libsystemd-network/sd-dhcp-server.c | 4 | ||||
| -rw-r--r-- | src/test/test-install-root.c | 3 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/home/homework.c b/src/home/homework.c index fc9f030392..38b740729c 100644 --- a/src/home/homework.c +++ b/src/home/homework.c @@ -1038,10 +1038,9 @@ static int home_remove(UserRecord *h) { if (deleted) log_info("Everything completed."); - else { - log_notice("Nothing to remove."); - return -EALREADY; - } + else + return log_notice_errno(SYNTHETIC_ERRNO(EALREADY), + "Nothing to remove."); return 0; } diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index 5154af2304..57b412b6cd 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -141,8 +141,8 @@ int sd_dhcp_lease_get_servers( return (int) lease->smtp_server_size; default: - log_debug("Uknown DHCP lease info item %d.", what); - return -ENXIO; + return log_debug_errno(SYNTHETIC_ERRNO(ENXIO), + "Uknown DHCP lease info item %d.", what); } } diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c index a4dcddd95d..3a75649aed 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -1162,8 +1162,8 @@ int sd_dhcp_server_set_servers( break; default: - log_debug("Uknown DHCP lease info item %d.", what); - return -ENXIO; + return log_debug_errno(SYNTHETIC_ERRNO(ENXIO), + "Uknown DHCP lease info item %d.", what); } if (*n_a == n_addresses && diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c index 0dabc9782e..79a105c5c3 100644 --- a/src/test/test-install-root.c +++ b/src/test/test-install-root.c @@ -1058,7 +1058,8 @@ static void verify_one( r = unit_file_verify_alias(i, alias, &alias2); log_info_errno(r, "alias %s ← %s: %d/%m (expected %d)%s%s%s", i->name, alias, r, expected, - alias2 ? " [" : "", alias2 ?: "", alias2 ? "]" : ""); + alias2 ? " [" : "", strempty(alias2), + alias2 ? "]" : ""); assert(r == expected); /* This is is test for "instance propagation". This propagation matters mostly for WantedBy= and |