From 1f3ff73e630988efd448c2468df9bac33326b13c Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 25 May 2008 18:12:43 +0200 Subject: update code-in-comment to accept cast of free arg * build-aux/useless-if-before-free: Update regexp. --- build-aux/useless-if-before-free | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'build-aux/useless-if-before-free') 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. -- cgit v1.2.1