From: Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
Date: Fri, 25 May 2018 14:31:27 +0000 (-0400)
Subject: global: start relying on fs_file_deinit(NULL) being a no-op
X-Git-Tag: 2.3.2.rc1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7fac54b52d5972bd8fbc5be6090c7e2385c512d;p=thirdparty%2Fdovecot%2Fcore.git

global: start relying on fs_file_deinit(NULL) being a no-op

Cleanup performed with the following semantic patch:

	@@
	expression E;
	@@

	- if (E != NULL) {
	- 	fs_file_deinit(&E);
	- }
	+ fs_file_deinit(&E);
---

diff --git a/src/doveadm/doveadm-fs.c b/src/doveadm/doveadm-fs.c
index 2eedea0c00..63af5d5408 100644
--- a/src/doveadm/doveadm-fs.c
+++ b/src/doveadm/doveadm-fs.c
@@ -323,8 +323,7 @@ static void doveadm_fs_delete_async_finish(struct fs_delete_ctx *ctx)
 		fs_wait_async(ctx->fs);
 	}
 	for (i = 0; i < ctx->files_count; i++) {
-		if (ctx->files[i] != NULL)
-			fs_file_deinit(&ctx->files[i]);
+		fs_file_deinit(&ctx->files[i]);
 	}
 }
 
diff --git a/src/lib-fs/fs-metawrap.c b/src/lib-fs/fs-metawrap.c
index 73b69dadd0..ca54183165 100644
--- a/src/lib-fs/fs-metawrap.c
+++ b/src/lib-fs/fs-metawrap.c
@@ -133,7 +133,7 @@ static void fs_metawrap_file_deinit(struct fs_file *_file)
 {
 	struct metawrap_fs_file *file = (struct metawrap_fs_file *)_file;
 
-	if (file->super_read != _file->parent && file->super_read != NULL)
+	if (file->super_read != _file->parent)
 		fs_file_deinit(&file->super_read);
 	str_free(&file->metadata_header);
 	fs_file_deinit(&_file->parent);
diff --git a/src/lib-fs/fs-sis-queue.c b/src/lib-fs/fs-sis-queue.c
index acac49c8dd..3cf5f2cb37 100644
--- a/src/lib-fs/fs-sis-queue.c
+++ b/src/lib-fs/fs-sis-queue.c
@@ -93,8 +93,7 @@ static void fs_sis_queue_file_deinit(struct fs_file *_file)
 {
 	struct sis_queue_fs_file *file = (struct sis_queue_fs_file *)_file;
 
-	if (_file->parent != NULL)
-		fs_file_deinit(&_file->parent);
+	fs_file_deinit(&_file->parent);
 	i_free(file->file.path);
 	i_free(file);
 }
diff --git a/src/plugins/fs-compress/fs-compress.c b/src/plugins/fs-compress/fs-compress.c
index ff8445783c..aae057c13d 100644
--- a/src/plugins/fs-compress/fs-compress.c
+++ b/src/plugins/fs-compress/fs-compress.c
@@ -142,7 +142,7 @@ static void fs_compress_file_deinit(struct fs_file *_file)
 {
 	struct compress_fs_file *file = (struct compress_fs_file *)_file;
 
-	if (file->super_read != _file->parent && file->super_read != NULL)
+	if (file->super_read != _file->parent)
 		fs_file_deinit(&file->super_read);
 	fs_file_deinit(&_file->parent);
 	i_free(file->file.path);
diff --git a/src/plugins/mail-crypt/fs-crypt-common.c b/src/plugins/mail-crypt/fs-crypt-common.c
index a8049dfc3f..dca59c28b7 100644
--- a/src/plugins/mail-crypt/fs-crypt-common.c
+++ b/src/plugins/mail-crypt/fs-crypt-common.c
@@ -168,7 +168,7 @@ static void fs_crypt_file_deinit(struct fs_file *_file)
 {
 	struct crypt_fs_file *file = (struct crypt_fs_file *)_file;
 
-	if (file->super_read != _file->parent && file->super_read != NULL)
+	if (file->super_read != _file->parent)
 		fs_file_deinit(&file->super_read);
 	fs_file_deinit(&_file->parent);
 	i_free(file->file.path);