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 79b10be..4939b80 100644 (file)
--- 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 e6e03a8..725e52d 100644 (file)
--- 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: