From: Jim Meyering <meyering@redhat.com>
Date: Sun, 3 Jul 2011 21:00:15 +0000 (+0200)
Subject: maint.mk: correct omissions in prohibit_argmatch_without_use check
X-Git-Tag: v0.1~2189
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=84fb438212273a62452a0eea47dc695e0c3c911f;p=gnulib.git

maint.mk: correct omissions in prohibit_argmatch_without_use check

This rule would mistakenly report that argmatch.h is included without
use even when both the argmatch and invalid_arg macro were used.
* top/maint.mk (sc_prohibit_argmatch_without_use): Also detect uses
of argmatch and invalid_arg.
---

diff --git a/ChangeLog b/ChangeLog
index 79b10becc..4939b801d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-03  Jim Meyering  <meyering@redhat.com>
+
+	maint.mk: correct omissions in prohibit_argmatch_without_use check
+	This rule would mistakenly report that argmatch.h is included without
+	use even when both the argmatch and invalid_arg macro were used.
+	* top/maint.mk (sc_prohibit_argmatch_without_use): Also detect uses
+	of argmatch and invalid_arg.
+
 2011-07-03  Bruno Haible  <bruno@clisp.org>
 
 	Comments about EINTR.
diff --git a/top/maint.mk b/top/maint.mk
index e6e03a897..725e52de0 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -516,7 +516,7 @@ sc_prohibit_safe_read_without_use:
 
 sc_prohibit_argmatch_without_use:
 	@h='argmatch.h' \
-	re='(\<(ARRAY_CARDINALITY|X?ARGMATCH(|_TO_ARGUMENT|_VERIFY))\>|\<argmatch(_exit_fn|_(in)?valid) *\()' \
+	re='(\<(ARRAY_CARDINALITY|X?ARGMATCH(|_TO_ARGUMENT|_VERIFY))\>|\<(invalid_arg|argmatch(_exit_fn|_(in)?valid)?) *\()' \
 	  $(_sc_header_without_use)
 
 sc_prohibit_canonicalize_without_use: