From: Pádraig Brady <P@draigBrady.com>
Date: Fri, 28 Jan 2022 14:54:00 +0000 (+0000)
Subject: maintainer-makefile: fix sc_error_message_uppercase false failure
X-Git-Tag: v1.0~2374
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3e1e74e65af0649224d84813df2e9ebea2e9a67;p=thirdparty%2Fgnulib.git

maintainer-makefile: fix sc_error_message_uppercase false failure

* top/maint.mk (sc_error_message_uppercase): Don't trigger for
any of the PRI... defines.  Note we add an extra constraint
here that PRI always follows a double quote, but that's
almost always the case, or can be easily made so by prepending
"" for example.
---

diff --git a/ChangeLog b/ChangeLog
index 1c036a5697..d59716db06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-01-28  Pádraig Brady  <P@draigBrady.com>
+
+	maintainer-makefile: fix sc_error_message_uppercase false failure
+	* top/maint.mk (sc_error_message_uppercase): Don't trigger for
+	any of the PRI... defines.
+
 2022-01-27  Paul Eggert  <eggert@cs.ucla.edu>
 
 	alignalloc: work around AddressSanitizer bug
diff --git a/top/maint.mk b/top/maint.mk
index 344acb2af6..92cef425cf 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -473,7 +473,7 @@ sc_error_message_uppercase:
 	@$(VC_LIST_EXCEPT)						\
 	  | xargs $(GREP) -nEA2 '[^rp]error *\(' /dev/null		\
 	  | $(GREP) -E '"[A-Z]'						\
-	  | $(GREP) -vE '"FATAL|"WARNING|"Java|"C#|PRIuMAX'		\
+	  | $(GREP) -vE '"FATAL|"WARNING|"Java|"C#|"PRI'		\
 	  && { echo '$(ME): found capitalized error message' 1>&2;	\
 	       exit 1; }						\
 	  || :