From cb0791d7a466db7406b040a2670cbb27dfc184b1 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 11 Nov 2009 19:36:10 +0100 Subject: [PATCH] maint/sc: remove useless if-before-free tests * src/diff.c (compare-files): Remove useless if stmts. * src/dir.c (diff_dirs): Likewise. * cfg.mk (local-checks-to-skip): Remove sc_avoid_if_before_free. --- cfg.mk | 1 - src/diff.c | 6 ++---- src/dir.c | 6 ++---- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/cfg.mk b/cfg.mk index f55080a..bc9484a 100644 --- a/cfg.mk +++ b/cfg.mk @@ -32,7 +32,6 @@ gpg_key_ID = B9AB9A16 # Tests not to run as part of "make distcheck". local-checks-to-skip = \ - sc_avoid_if_before_free \ sc_cast_of_x_alloc_return_value \ sc_error_message_period \ sc_error_message_uppercase \ diff --git a/src/diff.c b/src/diff.c index 47bfd08..b4ca638 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1314,10 +1314,8 @@ compare_files (struct comparison const *parent, pfatal_with_name (_("standard output")); } - if (free0) - free (free0); - if (free1) - free (free1); + free (free0); + free (free1); return status; } diff --git a/src/dir.c b/src/dir.c index 814e8af..8f62ffc 100644 --- a/src/dir.c +++ b/src/dir.c @@ -263,10 +263,8 @@ diff_dirs (struct comparison const *cmp, for (i = 0; i < 2; i++) { - if (dirdata[i].names) - free (dirdata[i].names); - if (dirdata[i].data) - free (dirdata[i].data); + free (dirdata[i].names); + free (dirdata[i].data); } return val;