summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xbuild-aux/useless-if-before-free6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 766cc3fa08..fb3db2227a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-29 Jim Meyering <meyering@redhat.com>
+
+ Fix broken useless-if-before-free script.
+ * build-aux/useless-if-before-free: Fix typo: missing "?" after
+ the expression to match cast of argument to free-like function.
+
2008-04-29 Eric Blake <ebb9@byu.net>
Use new header.
diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index 626d19ab2b..89e7859626 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-03-12 13:06'; # UTC
+my $VERSION = '2008-04-29 17:55'; # 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
@@ -123,8 +123,8 @@ EOF
{
if ($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*\}))/sx)
+ (?: \s*$regexp\s*\((?:\s*\([^)]+\))?\s*\2\s*\)|
+ \s*\{\s*$regexp\s*\((?:\s*\([^)]+\))?\s*\2\s*\)\s*;\s*\}))/sx)
{
$found_match = 1;
$list