maint.mk: correct omissions in prohibit_argmatch_without_use check
authorJim Meyering <meyering@redhat.com>
Sun, 3 Jul 2011 21:00:15 +0000 (23:00 +0200)
committerJim Meyering <meyering@redhat.com>
Sun, 3 Jul 2011 21:00:15 +0000 (23:00 +0200)
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.

ChangeLog
top/maint.mk

index 79b10beccaf5da25110616b4b2284d7e53ac7dc9..4939b801d5e293000c27f79135a30a3383a71fee 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.
index e6e03a897b1c7d9a783c6b0396ab5cbc02f58076..725e52de097d5f07bedcf0e446947b20ea796462 100644 (file)
@@ -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: