diff options
author | Jim Meyering <meyering@redhat.com> | 2009-04-07 10:38:35 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2009-04-07 11:37:12 +0200 |
commit | d29d6c11acd73086ac7ffabb9a451faa1d4984f9 (patch) | |
tree | 6f4bf36e94a9780d4ea635bb3c1ddc6b333c326b | |
parent | c69a33bddf1d5c5acbd4f485692a22b23a47b3c8 (diff) | |
download | gnulib-d29d6c11acd73086ac7ffabb9a451faa1d4984f9.tar.gz |
useless-if-before-free: show how to remove braced useless free, too
* build-aux/useless-if-before-free: still only in a comment, though.
-rw-r--r-- | ChangeLog | 5 | ||||
-rwxr-xr-x | build-aux/useless-if-before-free | 12 |
2 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2009-04-07 Jim Meyering <meyering@redhat.com> + + useless-if-before-free: show how to remove braced useless free, too + * build-aux/useless-if-before-free: still only in a comment, though. + 2009-04-07 Reuben Thomas <rrt@sc3d.org> maint.mk: import changes to syntax-check macros from coreutils 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. |