From 8767d75b9df3c82db6d92d40de42da760140ce75 Mon Sep 17 00:00:00 2001
From: =?utf8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Mon, 7 Mar 2022 22:39:32 +0000
Subject: [PATCH] maint: address syntax-check issues in recent commit

* cfg.mk (sc_die_EXIT_FAILURE): Generalize to match any EXIT_ define,
and also relax to ignore error() usage with ternary operator.
* src/chroot.c (main): Use () to avoid the sc_error_quotes check.
---
 cfg.mk       | 4 ++--
 src/chroot.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 90066f19a1..f62801ebd4 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -192,7 +192,7 @@ sc_prohibit_quotes_notation:
 # Files in src/ should quote all strings in error() output, so that
 # unexpected input chars like \r etc. don't corrupt the error.
 # In edge cases this can be avoided by putting the format string
-# on a separate line to the following arguments.
+# on a separate line to the arguments, or the arguments in parenthesis.
 sc_error_quotes:
 	@cd $(srcdir)/src && GIT_PAGER= git grep -n 'error *(.*%s.*, [^(]*);$$'\
 	  *.c | grep -v ', q' \
@@ -236,7 +236,7 @@ sc_error_shell_always_quotes:
 # to the compiler that it doesn't return.
 sc_die_EXIT_FAILURE:
 	@cd $(srcdir)/src && GIT_PAGER= git grep -E \
-	    'error \(.*_(FAILURE|INVALID)' \
+	    'error \([^?]*EXIT_' \
 	  && { echo '$(ME): '"Use die() instead of error" 1>&2; \
 	       exit 1; }  \
 	  || :
diff --git a/src/chroot.c b/src/chroot.c
index be96013042..9839404006 100644
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -358,7 +358,7 @@ main (int argc, char **argv)
       char const *err = parse_user_spec_warn (userspec, &uid, &gid,
                                               NULL, NULL, &warn);
       if (err)
-        error (warn ? 0 : EXIT_CANCELED, 0, "%s", err);
+        error (warn ? 0 : EXIT_CANCELED, 0, "%s", (err));
     }
 
   /* If no gid is supplied or looked up, do so now.
-- 
2.47.2