From 61eb313e28c0f0ba8eb144c5b5f331b6b74c4fc8 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 31 Mar 2010 20:05:59 +0200 Subject: [PATCH] sfree(NULL) is ok Signed-off-by: Jens Axboe --- filesetup.c | 7 ++----- fio.c | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/filesetup.c b/filesetup.c index c1889813..32b8b2e4 100644 --- a/filesetup.c +++ b/filesetup.c @@ -746,11 +746,8 @@ void close_and_free_files(struct thread_data *td) sfree(f->file_name); f->file_name = NULL; - - if (f->file_map) { - sfree(f->file_map); - f->file_map = NULL; - } + sfree(f->file_map); + f->file_map = NULL; sfree(f); } diff --git a/fio.c b/fio.c index 03dc6cc8..ae62d233 100644 --- a/fio.c +++ b/fio.c @@ -1694,8 +1694,7 @@ int main(int argc, char *argv[]) cgroup_kill(cgroup_list); sfree(cgroup_list); - if (cgroup_mnt) - sfree(cgroup_mnt); + sfree(cgroup_mnt); fio_mutex_remove(startup_mutex); fio_mutex_remove(writeout_mutex); -- 2.25.1