Mercurial > hg > octave-lojdl > gnulib-hg
changeset 10017:6e074c9f695a
When the is more than one match in a block, match all of them.
* build-aux/useless-if-before-free: Iterate through each block
until there are no more matches.
| author | Jim Meyering <meyering@redhat.com> |
|---|---|
| date | Tue, 29 Apr 2008 22:04:47 +0200 |
| parents | 4f6cf8a4d874 |
| children | 8406478f0d13 |
| files | ChangeLog build-aux/useless-if-before-free |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-04-29 Jim Meyering <meyering@redhat.com> + When the is more than one match in a block, match all of them. + * build-aux/useless-if-before-free: Iterate through each block + until there are no more matches. + 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.
--- 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-04-29 17:55'; # UTC +my $VERSION = '2008-04-29 19: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 @@ -121,10 +121,10 @@ $err = EXIT_ERROR, next; while (defined (my $line = <FH>)) { - if ($line =~ + 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*\}))/sx) + \s*\{\s*$regexp\s*\((?:\s*\([^)]+\))?\s*\2\s*\)\s*;\s*\}))/sxg) { $found_match = 1; $list