summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xbuild-aux/useless-if-before-free4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ac5ab8cd1..7dcf4fd84b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-05-25 Jim Meyering <meyering@redhat.com>
+ useless-if-before-free: accept white space in the expression.
+ * build-aux/useless-if-before-free: For now, any white space
+ in the expression must be identical in the free argument.
+
useless-if-before-free: efficiency tweak
* build-aux/useless-if-before-free: Make the expression-matching
regexp "shy".
diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index dcfc6280ab..f08b6cba6c 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:56'; # UTC
+my $VERSION = '2008-05-25 16:59'; # 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*NULL)?\s*\)
(?: \s*$regexp\s*\((?:\s*\([^)]+\))?\s*\1\s*\)|
\s*\{\s*$regexp\s*\((?:\s*\([^)]+\))?\s*\1\s*\)\s*;\s*\}))/sxg)
{