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/delta | |
parent | basic/log: add concept of "synthethic errnos" (diff) | |
download | systemd-baaa35ad706419ae5aacc11d2bece5bd8b73ee42.tar.xz systemd-baaa35ad706419ae5aacc11d2bece5bd8b73ee42.zip |
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/delta')
-rw-r--r-- | src/delta/delta.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/delta/delta.c b/src/delta/delta.c index f3a23f95d4..328f5654e8 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -513,8 +513,8 @@ static int process_suffix_chop(const char *arg) { } } - log_error("Invalid suffix specification %s.", arg); - return -EINVAL; + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Invalid suffix specification %s.", arg); } static int help(void) { @@ -604,10 +604,9 @@ static int parse_argv(int argc, char *argv[]) { case 't': { int f; f = parse_flags(optarg, arg_flags); - if (f < 0) { - log_error("Failed to parse flags field."); - return -EINVAL; - } + if (f < 0) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Failed to parse flags field."); arg_flags = f; break; } @@ -619,10 +618,9 @@ static int parse_argv(int argc, char *argv[]) { int b; b = parse_boolean(optarg); - if (b < 0) { - log_error("Failed to parse diff boolean."); - return -EINVAL; - } + if (b < 0) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Failed to parse diff boolean."); arg_diff = b; } |