Recognize optional cast of the argument to free.

* build-aux/useless-if-before-free: Update regexps.

diff --git a/ChangeLog b/ChangeLog
index 749d1cd8c8a4a15aa4731d7f1f0ae97f6692ad91..11152c8249595cf01531b798cba2949519354efc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-12  Jim Meyering  <meyering@redhat.com>
 
+       Recognize optional cast of the argument to free.
+       * build-aux/useless-if-before-free: Update regexps.
+
        * build-aux/bootstrap (gnulib_tool): Remove trailing blanks.
 
 2008-03-11  Bruno Haible  <bruno@clisp.org>

diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index eb18483789b538ac4363627b2f3ab1350f69efa5..626d19ab2b57763c1ce6e56c015778cebae33ef3 100755 (executable)
--- 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-02-11 08:08'; # UTC
+my $VERSION = '2008-03-12 13:06'; # 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*\2\s*\)|
-                \s*\{\s*$regexp\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