From 1714aa0a0558a42dfec317bbaadcc1537db1d713 Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Fri, 25 May 2018 10:38:36 -0400 Subject: [PATCH] global: start relying on fs_file_close(NULL) being a no-op Cleanup performed with the following semantic patch: @@ expression E; @@ - if (E != NULL) { - fs_file_close(E); - } + fs_file_close(E); --- src/lib-fs/fs-metawrap.c | 6 ++---- src/plugins/fs-compress/fs-compress.c | 6 ++---- src/plugins/mail-crypt/fs-crypt-common.c | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/lib-fs/fs-metawrap.c b/src/lib-fs/fs-metawrap.c index ca54183165..d12f166e93 100644 --- a/src/lib-fs/fs-metawrap.c +++ b/src/lib-fs/fs-metawrap.c @@ -146,10 +146,8 @@ static void fs_metawrap_file_close(struct fs_file *_file) struct metawrap_fs_file *file = (struct metawrap_fs_file *)_file; i_stream_unref(&file->input); - if (file->super_read != NULL) - fs_file_close(file->super_read); - if (_file->parent != NULL) - fs_file_close(_file->parent); + fs_file_close(file->super_read); + fs_file_close(_file->parent); } static void diff --git a/src/plugins/fs-compress/fs-compress.c b/src/plugins/fs-compress/fs-compress.c index aae057c13d..9b69490c5a 100644 --- a/src/plugins/fs-compress/fs-compress.c +++ b/src/plugins/fs-compress/fs-compress.c @@ -154,10 +154,8 @@ static void fs_compress_file_close(struct fs_file *_file) struct compress_fs_file *file = (struct compress_fs_file *)_file; i_stream_unref(&file->input); - if (file->super_read != NULL) - fs_file_close(file->super_read); - if (_file->parent != NULL) - fs_file_close(_file->parent); + fs_file_close(file->super_read); + fs_file_close(_file->parent); } static struct istream * diff --git a/src/plugins/mail-crypt/fs-crypt-common.c b/src/plugins/mail-crypt/fs-crypt-common.c index dca59c28b7..38905c587c 100644 --- a/src/plugins/mail-crypt/fs-crypt-common.c +++ b/src/plugins/mail-crypt/fs-crypt-common.c @@ -180,10 +180,8 @@ static void fs_crypt_file_close(struct fs_file *_file) struct crypt_fs_file *file = (struct crypt_fs_file *)_file; i_stream_unref(&file->input); - if (file->super_read != NULL) - fs_file_close(file->super_read); - if (_file->parent != NULL) - fs_file_close(_file->parent); + fs_file_close(file->super_read); + fs_file_close(_file->parent); } static int fs_crypt_read_file(const char *set_name, const char *path, -- 2.47.3