diff options
Diffstat (limited to 'build-aux/useless-if-before-free')
| -rwxr-xr-x | build-aux/useless-if-before-free | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free index 696c62147c..29d4917fdd 100755 --- a/build-aux/useless-if-before-free +++ b/build-aux/useless-if-before-free @@ -4,7 +4,7 @@ # Also detect "if (NULL != p) free (p);". # And with 0 in place of NULL. -my $VERSION = '2009-01-28 08:23'; # UTC +my $VERSION = '2009-04-07 08:05'; # 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 @@ -179,8 +179,14 @@ useless-if-before-free -l $(lid -knone free) | xargs -0 \ perl -0x3b -pi -e \ 's/\bif\s*\(\s*(\S+?)(?:\s*!=\s*NULL)?\s*\)\s+(free\s*\((?:\s*\([^)]+\))?\s*\1\s*\))/$2/s' -# Or, with git: -git ls-files -z |xargs -0 perl -0x3b -pi -e '...' +# Use the following to remove redundant uses of kfree inside braces. +# Note that -0777 puts perl in slurp-whole-file mode; +# but we have plenty of memory, these days... +free=kfree +git grep -l -z "$free *(" \ + | xargs -0 useless-if-before-free -l --name="$free" \ + | xargs -0 perl -0777 -pi -e \ + 's/\bif\s*\(\s*(\S+?)(?:\s*!=\s*NULL)?\s*\)\s*\{\s*('"$free"'\s*\((?:\s*\([^)]+\))?\s*\1\s*\);)\s*\}[^\n]*$/$2/gms' Be careful that the result of the above transformation is valid. If the matched string is followed by "else", then obviously, it won't be. |