From baaa35ad706419ae5aacc11d2bece5bd8b73ee42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 20 Nov 2018 23:40:44 +0100 Subject: 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. --- src/ask-password/ask-password.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ask-password') diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c index 530dc1ee6e..4637c32819 100644 --- a/src/ask-password/ask-password.c +++ b/src/ask-password/ask-password.c @@ -102,10 +102,10 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_TIMEOUT: - if (parse_sec(optarg, &arg_timeout) < 0) { - log_error("Failed to parse --timeout parameter %s", optarg); - return -EINVAL; - } + if (parse_sec(optarg, &arg_timeout) < 0) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Failed to parse --timeout parameter %s", + optarg); break; case ARG_ECHO: -- cgit v1.2.1