summaryrefslogtreecommitdiff
path: root/build-aux/useless-if-before-free
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-05-25 18:12:43 +0200
committerJim Meyering <meyering@redhat.com>2008-05-25 18:12:43 +0200
commit1f3ff73e630988efd448c2468df9bac33326b13c (patch)
tree7dc462836346acdda5ea879e88cdf18e7022f48c /build-aux/useless-if-before-free
parent1d7987fd58e092808b95f56d8cef81336b65fb09 (diff)
downloadgnulib-1f3ff73e630988efd448c2468df9bac33326b13c.tar.gz
update code-in-comment to accept cast of free arg
* build-aux/useless-if-before-free: Update regexp.
Diffstat (limited to 'build-aux/useless-if-before-free')
-rwxr-xr-xbuild-aux/useless-if-before-free10
1 files changed, 5 insertions, 5 deletions
diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index 48f55c661a..99b3c97432 100755
--- 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-05-01 19:11'; # UTC
+my $VERSION = '2008-05-25 15:40'; # 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
@@ -149,12 +149,12 @@ my $foo = <<'EOF';
# This adjusts them, removing the unnecessary "if (p)" part.
# FIXME: do something like this as an option (doesn't do braces):
-git ls-files -z |xargs -0 \
-perl -0x3b -pi -e 's/\bif\s*\(\s*(\S+?)(?:\s*!=\s*NULL)?\s*\)\s+(k?free\s*\(\s*\1\s*\))/$2/s'
-
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*\1\s*\))/$2/s'
+ '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 '...'
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.