From: Jim Meyering <meyering@redhat.com>
Date: Sun, 25 May 2008 16:58:29 +0000 (+0200)
Subject: Make the *outer* regexp shy, not the expr-matching one.
X-Git-Tag: v0.1~7348
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=7e85ccab96c79e5cf90a40e8abf55a93057c151e;p=gnulib.git

Make the *outer* regexp shy, not the expr-matching one.
---

diff --git a/ChangeLog b/ChangeLog
index 6efdd2dd1..9ac5ab8cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 	useless-if-before-free: efficiency tweak
 	* build-aux/useless-if-before-free: Make the expression-matching
 	regexp "shy".
+	Make the *outer* regexp shy, not the expr-matching one.
 
 	update code-in-comment to accept cast of free arg
 	* build-aux/useless-if-before-free: Update regexp.
diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index 9f237d6c9..dcfc6280a 100755
--- a/build-aux/useless-if-before-free
+++ b/build-aux/useless-if-before-free
@@ -2,7 +2,7 @@
 # Detect instances of "if (p) free (p);".
 # Likewise for "if (p != NULL) free (p);".  And with braces.
 
-my $VERSION = '2008-05-25 16:16'; # UTC
+my $VERSION = '2008-05-25 16:56'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -122,7 +122,7 @@ EOF
       while (defined (my $line = <FH>))
         {
           while ($line =~
-              /\b(if\s*\(\s*(?:\S+?)(?:\s*!=\s*NULL)?\s*\)
+              /\b(?:if\s*\(\s*(\S+?)(?:\s*!=\s*NULL)?\s*\)
                (?:   \s*$regexp\s*\((?:\s*\([^)]+\))?\s*\1\s*\)|
                 \s*\{\s*$regexp\s*\((?:\s*\([^)]+\))?\s*\1\s*\)\s*;\s*\}))/sxg)
             {