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 2eedea0c00b46fad776f9f02f951298b18be1a2c..63af5d54086c29a4ebdc7dc9b308e07776e41f4d 100644 (file)
--- 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 73b69dadd08764cf4ccccd540322459d4a99bc53..ca54183165d9edfb1be952760dd40d619207ce1f 100644 (file)
--- 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 acac49c8ddf292d88e23b0bda5099c7db57d5e16..3cf5f2cb37567178107e2e7c5a073e49048397b8 100644 (file)
--- 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 ff8445783c8a4ab7d554fdf34a8a4d2f342e31be..aae057c13d7fafcb98ef0fca589f685393b174da 100644 (file)
--- 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 a8049dfc3fc9bd3ab6c1277cf67f03adfea6b1dd..dca59c28b71a5d0e95750b031f1733b1a0b15ab2 100644 (file)
--- 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);