maint.mk: relax sc_prohibit_strcmp, to avoid a false positive

* top/maint.mk (sc_prohibit_strcmp): Relax regexp, so as to match
all uses of #define, not just those that start in column 1.
Richard W.M. Jones reported a false positive in
http://thread.gmane.org/gmane.comp.emulators.guestfs/1902

diff --git a/ChangeLog b/ChangeLog
index 5425df4..1279ad3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-09-17  Jim Meyering  <meyering@redhat.com>
+
+       maint.mk: relax sc_prohibit_strcmp, to avoid a false positive
+       * top/maint.mk (sc_prohibit_strcmp): Relax regexp, so as to match
+       all uses of #define, not just those that start in column 1.
+       Richard W.M. Jones reported a false positive in
+       http://thread.gmane.org/gmane.comp.emulators.guestfs/1902
+
 2012-09-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        localcharset: work around Mac OS X bug with UTF-8 and MB_CUR_MAX

diff --git a/top/maint.mk b/top/maint.mk
index 4627bc5..09f55c5 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -330,7 +330,7 @@ sc_prohibit_atoi_atof:
 sp_ = strcmp *\(.+\)
 sc_prohibit_strcmp:
        @prohibit='! *strcmp *\(|\<$(sp_) *[!=]=|[!=]= *$(sp_)'         \
-       exclude=':# *define STRN?EQ\('                                  \
+       exclude='# *define STRN?EQ\('                                   \
        halt='replace strcmp calls above with STREQ/STRNEQ'             \
          $(_sc_search_regexp)