diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-20 23:40:44 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-22 10:54:38 +0100 |
commit | baaa35ad706419ae5aacc11d2bece5bd8b73ee42 (patch) | |
tree | bb4b9c576fc56b3237d59e959ded7c245917fcd7 /src/timedate | |
parent | 52d86690d68779b120a4380f7cc740825827fb0d (diff) | |
download | systemd-baaa35ad706419ae5aacc11d2bece5bd8b73ee42.tar.gz |
coccinelle: make use of SYNTHETIC_ERRNO
Ideally, coccinelle would strip unnecessary braces too. But I do not see any
option in coccinelle for this, so instead, I edited the patch text using
search&replace to remove the braces. Unfortunately this is not fully automatic,
in particular it didn't deal well with if-else-if-else blocks and ifdefs, so
there is an increased likelikehood be some bugs in such spots.
I also removed part of the patch that coccinelle generated for udev, where we
returns -1 for failure. This should be fixed independently.
Diffstat (limited to 'src/timedate')
-rw-r--r-- | src/timedate/timedatectl.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 46712b71fc..24b103bbb7 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -438,15 +438,13 @@ static int map_server_address(sd_bus *bus, const char *member, sd_bus_message *m return 0; } - if (!IN_SET(family, AF_INET, AF_INET6)) { - log_error("Unknown address family %i", family); - return -EINVAL; - } + if (!IN_SET(family, AF_INET, AF_INET6)) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Unknown address family %i", family); - if (sz != FAMILY_ADDRESS_SIZE(family)) { - log_error("Invalid address size"); - return -EINVAL; - } + if (sz != FAMILY_ADDRESS_SIZE(family)) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Invalid address size"); r = in_addr_to_string(family, d, p); if (r < 0) |