From: Eric Blake <eblake@redhat.com>
Date: Thu, 6 Jan 2011 21:24:57 +0000 (-0700)
Subject: maint.mk: improve sc_prohibit_strcmp regex
X-Git-Tag: v0.1~3380
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=456a9f9a86c8b4e71f38003027dfbaa45c19bf20;hp=bf2f355f6c882bfbefdaaa8c9b88b621c34a3c83;p=gnulib.git

maint.mk: improve sc_prohibit_strcmp regex

* top/maint.mk (sc_prohibit_strcmp): Detect strcmp()!=0, as
documented.  Also, detect strcmp((expr),expr) == 0.  Exempt the
definition of STRNEQ.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 2816f9519..d233fb72b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-01-06  Eric Blake  <eblake@redhat.com>
 
+	maint.mk: improve sc_prohibit_strcmp regex
+	* top/maint.mk (sc_prohibit_strcmp): Detect strcmp()!=0, as
+	documented.  Also, detect strcmp((expr),expr) == 0.  Exempt the
+	definition of STRNEQ.
+
 	signal: work around Haiku issue with SIGBUS
 	* lib/siglist.h: Add comment.
 	* lib/sig2str.c (numname_table): Swap SIGBUS order, to match
diff --git a/top/maint.mk b/top/maint.mk
index f8923048d..ae280f648 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -292,10 +292,10 @@ sc_prohibit_atoi_atof:
 
 # Use STREQ rather than comparing strcmp == 0, or != 0.
 sc_prohibit_strcmp:
-	@grep -nE '! *str''cmp *\(|\<str''cmp *\([^)]+\) *=='		\
+	@grep -nE '! *str''cmp *\(|\<str''cmp *\(.+\) *[!=]='	\
 	    $$($(VC_LIST_EXCEPT))					\
-	  | grep -vE ':# *define STREQ\(' &&				\
-	  { echo '$(ME): use STREQ in place of the above uses of str''cmp' \
+	  | grep -vE ':# *define STRN?EQ\(' &&				\
+	  { echo '$(ME): replace str''cmp calls above with STREQ/STRNEQ' \
 		1>&2; exit 1; } || :
 
 # Pass EXIT_*, not number, to usage, exit, and error (when exiting)