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/cgtop/cgtop.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'src/cgtop') diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c index 562e6ece5b..5f6e778a38 100644 --- a/src/cgtop/cgtop.c +++ b/src/cgtop/cgtop.c @@ -779,10 +779,10 @@ static int parse_argv(int argc, char *argv[]) { arg_cpu_type = CPU_TIME; else if (streq(optarg, "percentage")) arg_cpu_type = CPU_PERCENT; - else { - log_error("Unknown argument to --cpu=: %s", optarg); - return -EINVAL; - } + else + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Unknown argument to --cpu=: %s", + optarg); } else arg_cpu_type = CPU_TIME; @@ -799,10 +799,10 @@ static int parse_argv(int argc, char *argv[]) { r = parse_sec(optarg, &arg_delay); if (r < 0) return log_error_errno(r, "Failed to parse delay parameter '%s': %m", optarg); - if (arg_delay <= 0) { - log_error("Invalid delay parameter '%s'", optarg); - return -EINVAL; - } + if (arg_delay <= 0) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Invalid delay parameter '%s'", + optarg); break; @@ -856,10 +856,10 @@ static int parse_argv(int argc, char *argv[]) { arg_order = ORDER_MEMORY; else if (streq(optarg, "io")) arg_order = ORDER_IO; - else { - log_error("Invalid argument to --order=: %s", optarg); - return -EINVAL; - } + else + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Invalid argument to --order=: %s", + optarg); break; case 'k': @@ -892,10 +892,9 @@ static int parse_argv(int argc, char *argv[]) { if (optind == argc - 1) arg_root = argv[optind]; - else if (optind < argc) { - log_error("Too many arguments."); - return -EINVAL; - } + else if (optind < argc) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Too many arguments."); return 1; } -- cgit v1.2.1