diff options
| author | Simon Josefsson <simon@josefsson.org> | 2011-04-24 10:30:21 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2011-04-24 11:00:17 +0200 |
| commit | 09ad4a8dfd18822961c5a8501467eab2a193f670 (patch) | |
| tree | 7625331295142f00828ac32a1fb4b5da0c9a142d /build-aux/useless-if-before-free | |
| parent | cc8b9e8b383fb49e03606255949a00143f0f89a2 (diff) | |
| download | libtasn1-09ad4a8dfd18822961c5a8501467eab2a193f670.tar.gz libtasn1-09ad4a8dfd18822961c5a8501467eab2a193f670.tar.bz2 libtasn1-09ad4a8dfd18822961c5a8501467eab2a193f670.zip | |
Update gnulib files and fix syntax-check warnings.
Diffstat (limited to 'build-aux/useless-if-before-free')
| -rwxr-xr-x | build-aux/useless-if-before-free | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free index 01a6d3d..b8f5a26 100755 --- a/build-aux/useless-if-before-free +++ b/build-aux/useless-if-before-free @@ -2,11 +2,9 @@ eval '(exit $?0)' && eval 'exec perl -wST "$0" ${1+"$@"}' & eval 'exec perl -wST "$0" $argv:q' if 0; # Detect instances of "if (p) free (p);". -# Likewise for "if (p != NULL) free (p);". And with braces. -# Also detect "if (NULL != p) free (p);". -# And with 0 in place of NULL. +# Likewise "if (p != 0)", "if (0 != p)", or with NULL; and with braces. -my $VERSION = '2009-04-16 15:57'; # UTC +my $VERSION = '2011-04-20 13:43'; # 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 @@ -63,7 +61,7 @@ detect free-like functions named FOO and BAR. OPTIONS: - --list print only the name of each matching FILE (\0-terminated) + --list print only the name of each matching FILE (\\0-terminated) --name=N add name N to the list of \`free\'-like functions to detect; may be repeated @@ -134,7 +132,7 @@ sub is_NULL ($) while ($line =~ /\b(if\s*\(\s*([^)]+?)(?:\s*!=\s*([^)]+?))?\s*\) # 1 2 3 - (?: \s*$regexp\s*\((?:\s*\([^)]+\))?\s*([^)]+)\)| + (?: \s*$regexp\s*\((?:\s*\([^)]+\))?\s*([^)]+)\)\s*;| \s*\{\s*$regexp\s*\((?:\s*\([^)]+\))?\s*([^)]+)\)\s*;\s*\}))/sxg) { my $all = $1; @@ -181,7 +179,7 @@ free=xfree git grep -l -z "$free *(" \ | xargs -0 useless-if-before-free -l --name="$free" \ | xargs -0 perl -0x3b -pi -e \ - 's/\bif\s*\(\s*(\S+?)(?:\s*!=\s*(?:0|NULL))?\s*\)\s+('"$free"'\s*\((?:\s*\([^)]+\))?\s*\1\s*\))/$2/s' + 's/\bif\s*\(\s*(\S+?)(?:\s*!=\s*(?:0|NULL))?\s*\)\s+('"$free"'\s*\((?:\s*\([^)]+\))?\s*\1\s*\)\s*;)/$2/s' # Use the following to remove redundant uses of kfree inside braces. # Note that -0777 puts perl in slurp-whole-file mode; |