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

global: start relying on fs_deinit(NULL) and fs_unref(NULL) being no-ops

Cleanup performed with the following semantic patch:

	@@
	expression E;
	@@

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

	@@
	expression E;
	@@

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

diff --git a/src/lib-fs/fs-metawrap.c b/src/lib-fs/fs-metawrap.c
index d12f166e93..22f6dd83f3 100644
--- a/src/lib-fs/fs-metawrap.c
+++ b/src/lib-fs/fs-metawrap.c
@@ -75,8 +75,7 @@ static void fs_metawrap_deinit(struct fs *_fs)
 {
 	struct metawrap_fs *fs = (struct metawrap_fs *)_fs;
 
-	if (_fs->parent != NULL)
-		fs_deinit(&_fs->parent);
+	fs_deinit(&_fs->parent);
 	i_free(fs);
 }
 
diff --git a/src/lib-fs/fs-randomfail.c b/src/lib-fs/fs-randomfail.c
index 906fa59d13..87bb1ee42b 100644
--- a/src/lib-fs/fs-randomfail.c
+++ b/src/lib-fs/fs-randomfail.c
@@ -199,8 +199,7 @@ static void fs_randomfail_deinit(struct fs *_fs)
 {
 	struct randomfail_fs *fs = (struct randomfail_fs *)_fs;
 
-	if (_fs->parent != NULL)
-		fs_deinit(&_fs->parent);
+	fs_deinit(&_fs->parent);
 	i_free(fs);
 }
 
diff --git a/src/lib-fs/fs-sis-queue.c b/src/lib-fs/fs-sis-queue.c
index 3cf5f2cb37..e23e9261cf 100644
--- a/src/lib-fs/fs-sis-queue.c
+++ b/src/lib-fs/fs-sis-queue.c
@@ -61,8 +61,7 @@ static void fs_sis_queue_deinit(struct fs *_fs)
 {
 	struct sis_queue_fs *fs = (struct sis_queue_fs *)_fs;
 
-	if (_fs->parent != NULL)
-		fs_deinit(&_fs->parent);
+	fs_deinit(&_fs->parent);
 	i_free(fs->queue_dir);
 	i_free(fs);
 }
diff --git a/src/lib-fs/fs-sis.c b/src/lib-fs/fs-sis.c
index 4f76851636..db88234600 100644
--- a/src/lib-fs/fs-sis.c
+++ b/src/lib-fs/fs-sis.c
@@ -72,8 +72,7 @@ static void fs_sis_deinit(struct fs *_fs)
 {
 	struct sis_fs *fs = (struct sis_fs *)_fs;
 
-	if (_fs->parent != NULL)
-		fs_deinit(&_fs->parent);
+	fs_deinit(&_fs->parent);
 	i_free(fs);
 }
 
diff --git a/src/lib-storage/index/dbox-common/dbox-storage.c b/src/lib-storage/index/dbox-common/dbox-storage.c
index 7d1bc50a76..a54f0a4282 100644
--- a/src/lib-storage/index/dbox-common/dbox-storage.c
+++ b/src/lib-storage/index/dbox-common/dbox-storage.c
@@ -143,8 +143,7 @@ void dbox_storage_destroy(struct mail_storage *_storage)
 {
 	struct dbox_storage *storage = DBOX_STORAGE(_storage);
 
-	if (storage->attachment_fs != NULL)
-		fs_deinit(&storage->attachment_fs);
+	fs_deinit(&storage->attachment_fs);
 	index_storage_destroy(_storage);
 }
 
diff --git a/src/plugins/fs-compress/fs-compress.c b/src/plugins/fs-compress/fs-compress.c
index 9b69490c5a..ab2bbf159b 100644
--- a/src/plugins/fs-compress/fs-compress.c
+++ b/src/plugins/fs-compress/fs-compress.c
@@ -101,8 +101,7 @@ static void fs_compress_deinit(struct fs *_fs)
 {
 	struct compress_fs *fs = (struct compress_fs *)_fs;
 
-	if (_fs->parent != NULL)
-		fs_deinit(&_fs->parent);
+	fs_deinit(&_fs->parent);
 	i_free(fs);
 }
 
diff --git a/src/plugins/mail-crypt/fs-crypt-common.c b/src/plugins/mail-crypt/fs-crypt-common.c
index 38905c587c..eb60ff1371 100644
--- a/src/plugins/mail-crypt/fs-crypt-common.c
+++ b/src/plugins/mail-crypt/fs-crypt-common.c
@@ -122,8 +122,7 @@ static void fs_crypt_deinit(struct fs *_fs)
 	struct crypt_fs *fs = (struct crypt_fs *)_fs;
 
 	mail_crypt_global_keys_free(&fs->keys);
-	if (_fs->parent != NULL)
-		fs_deinit(&_fs->parent);
+	fs_deinit(&_fs->parent);
 	i_free(fs->enc_algo);
 	i_free(fs->set_prefix);
 	i_free(fs->public_key_path);