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.

2 files changed, 7 insertions, 9 deletions

diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index c089830b0d..8e04eb3c23 100644
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -211,11 +211,10 @@ static int parse_argv(int argc, char *argv[]) {
                         assert_not_reached("Unhandled option");
                 }
 
-        if (optind + 1 != argc) {
-                log_error("%s excepts exactly one argument (the mount point).",
-                          program_invocation_short_name);
-                return -EINVAL;
-        }
+        if (optind + 1 != argc)
+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                       "%s excepts exactly one argument (the mount point).",
+                                       program_invocation_short_name);
 
         arg_target = argv[optind];
 
diff --git a/src/partition/makefs.c b/src/partition/makefs.c
index 22ff83dc77..88834092bd 100644
--- a/src/partition/makefs.c
+++ b/src/partition/makefs.c
@@ -51,10 +51,9 @@ static int run(int argc, char *argv[]) {
 
         log_setup_service();
 
-        if (argc != 3) {
-                log_error("This program expects two arguments.");
-                return -EINVAL;
-        }
+        if (argc != 3)
+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                       "This program expects two arguments.");
 
         type = argv[1];
         device = argv[2];