summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xbuild-aux/useless-if-before-free8
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d8efec747..6efdd2dd10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-05-25 Jim Meyering <meyering@redhat.com>
+ useless-if-before-free: efficiency tweak
+ * build-aux/useless-if-before-free: Make the expression-matching
+ regexp "shy".
+
update code-in-comment to accept cast of free arg
* build-aux/useless-if-before-free: Update regexp.
@@ -29,7 +33,7 @@
acl_free.
* m4/acl.m4 (gl_FUNC_ACL): Look also in libpacl library. Test for
acl_free_text function. Require AC_C_INLINE.
-
+
2008-05-22 Bruno Haible <bruno@clisp.org>
Make copy_acl work on MacOS X 10.5.
diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index 99b3c97432..9f237d6c91 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 15:40'; # UTC
+my $VERSION = '2008-05-25 16:16'; # 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,9 +122,9 @@ EOF
while (defined (my $line = <FH>))
{
while ($line =~
- /\b(if\s*\(\s*(\S+?)(?:\s*!=\s*NULL)?\s*\)
- (?: \s*$regexp\s*\((?:\s*\([^)]+\))?\s*\2\s*\)|
- \s*\{\s*$regexp\s*\((?:\s*\([^)]+\))?\s*\2\s*\)\s*;\s*\}))/sxg)
+ /\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)
{
$found_match = 1;
$list