lib-fs: Rename deinit vfunc to free

diff --git a/src/lib-fs/fs-api-private.h b/src/lib-fs/fs-api-private.h
index 4861b4f4b8b301d0994b0a55287ebf0dc8cebb20..ec68a2d536a6bb13bfeedfdcf0692e117262fb53 100644 (file)
--- a/src/lib-fs/fs-api-private.h
+++ b/src/lib-fs/fs-api-private.h
@@ -29,7 +29,7 @@ struct fs_vfuncs {
        struct fs *(*alloc)(void);
        int (*init)(struct fs *fs, const char *args,
                    const struct fs_settings *set, const char **error_r);
-       void (*deinit)(struct fs *fs);
+       void (*free)(struct fs *fs);
 
        enum fs_properties (*get_properties)(struct fs *fs);
 

diff --git a/src/lib-fs/fs-api.c b/src/lib-fs/fs-api.c
index 92dd9f20f003d5e9462f85020e5d393dfc1608c8..3a7dbea6e8e2195b8565b8c32079e1d703d5ba34 100644 (file)
--- a/src/lib-fs/fs-api.c
+++ b/src/lib-fs/fs-api.c
@@ -236,7 +236,7 @@ void fs_unref(struct fs **_fs)
                        stats_dist_deinit(&fs->stats.timings[i]);
        }
        T_BEGIN {
-               fs->v.deinit(fs);
+               fs->v.free(fs);
        } T_END;
        array_free_i(&module_contexts_arr);
 }

diff --git a/src/lib-fs/fs-dict.c b/src/lib-fs/fs-dict.c
index 4730f35f96aa9ce5dc3c200f7b5ead04fc70999f..20a8255a72954fd5d0161a1cba6766823d3824cf 100644 (file)
--- a/src/lib-fs/fs-dict.c
+++ b/src/lib-fs/fs-dict.c
@@ -83,7 +83,7 @@ fs_dict_init(struct fs *_fs, const char *args, const struct fs_settings *set,
        return 0;
 }
 
-static void fs_dict_deinit(struct fs *_fs)
+static void fs_dict_free(struct fs *_fs)
 {
        struct dict_fs *fs = (struct dict_fs *)_fs;
 
@@ -326,7 +326,7 @@ const struct fs fs_class_dict = {
        .v = {
                fs_dict_alloc,
                fs_dict_init,
-               fs_dict_deinit,
+               fs_dict_free,
                fs_dict_get_properties,
                fs_dict_file_alloc,
                fs_dict_file_init,

diff --git a/src/lib-fs/fs-metawrap.c b/src/lib-fs/fs-metawrap.c
index e1ed2d90ba95f7aa77d9476cb162a617d8e00af0..a2de33acb3aab7107187ab86d9939a681981094d 100644 (file)
--- a/src/lib-fs/fs-metawrap.c
+++ b/src/lib-fs/fs-metawrap.c
@@ -69,7 +69,7 @@ fs_metawrap_init(struct fs *_fs, const char *args,
        return 0;
 }
 
-static void fs_metawrap_deinit(struct fs *_fs)
+static void fs_metawrap_free(struct fs *_fs)
 {
        struct metawrap_fs *fs = (struct metawrap_fs *)_fs;
 
@@ -493,7 +493,7 @@ const struct fs fs_class_metawrap = {
        .v = {
                fs_metawrap_alloc,
                fs_metawrap_init,
-               fs_metawrap_deinit,
+               fs_metawrap_free,
                fs_metawrap_get_properties,
                fs_metawrap_file_alloc,
                fs_metawrap_file_init,

diff --git a/src/lib-fs/fs-posix.c b/src/lib-fs/fs-posix.c
index 1b42da012ffb8fdff888122b257e0581ee673761..5576960815990d048c08aff78efd06285ae83655 100644 (file)
--- a/src/lib-fs/fs-posix.c
+++ b/src/lib-fs/fs-posix.c
@@ -130,7 +130,7 @@ fs_posix_init(struct fs *_fs, const char *args, const struct fs_settings *set,
        return 0;
 }
 
-static void fs_posix_deinit(struct fs *_fs)
+static void fs_posix_free(struct fs *_fs)
 {
        struct posix_fs *fs = container_of(_fs, struct posix_fs, fs);
 
@@ -990,7 +990,7 @@ const struct fs fs_class_posix = {
        .v = {
                fs_posix_alloc,
                fs_posix_init,
-               fs_posix_deinit,
+               fs_posix_free,
                fs_posix_get_properties,
                fs_posix_file_alloc,
                fs_posix_file_init,

diff --git a/src/lib-fs/fs-randomfail.c b/src/lib-fs/fs-randomfail.c
index cd63fd7c5e1200e40e635ba1025b66554e110c6b..058c4eb8bcddaf820c2cc64f54b6e27491b071e9 100644 (file)
--- a/src/lib-fs/fs-randomfail.c
+++ b/src/lib-fs/fs-randomfail.c
@@ -194,7 +194,7 @@ fs_randomfail_init(struct fs *_fs, const char *args,
        return 0;
 }
 
-static void fs_randomfail_deinit(struct fs *_fs)
+static void fs_randomfail_free(struct fs *_fs)
 {
        struct randomfail_fs *fs = (struct randomfail_fs *)_fs;
 
@@ -517,7 +517,7 @@ const struct fs fs_class_randomfail = {
        .v = {
                fs_randomfail_alloc,
                fs_randomfail_init,
-               fs_randomfail_deinit,
+               fs_randomfail_free,
                fs_randomfail_get_properties,
                fs_randomfail_file_alloc,
                fs_randomfail_file_init,

diff --git a/src/lib-fs/fs-sis-queue.c b/src/lib-fs/fs-sis-queue.c
index 35ac314162ff0ad442e05221da3b0792d11fadb7..60408ca07b0901d58ac3507613cfa9469fd9a7ee 100644 (file)
--- a/src/lib-fs/fs-sis-queue.c
+++ b/src/lib-fs/fs-sis-queue.c
@@ -55,7 +55,7 @@ fs_sis_queue_init(struct fs *_fs, const char *args,
        return 0;
 }
 
-static void fs_sis_queue_deinit(struct fs *_fs)
+static void fs_sis_queue_free(struct fs *_fs)
 {
        struct sis_queue_fs *fs = (struct sis_queue_fs *)_fs;
 
@@ -173,7 +173,7 @@ const struct fs fs_class_sis_queue = {
        .v = {
                fs_sis_queue_alloc,
                fs_sis_queue_init,
-               fs_sis_queue_deinit,
+               fs_sis_queue_free,
                fs_wrapper_get_properties,
                fs_sis_queue_file_alloc,
                fs_sis_queue_file_init,

diff --git a/src/lib-fs/fs-sis.c b/src/lib-fs/fs-sis.c
index 0d3d1cd5d414277142691cbcbe299199af5f7d1c..1552ee663b0c7ca2590275a3cb0ede409787de7c 100644 (file)
--- a/src/lib-fs/fs-sis.c
+++ b/src/lib-fs/fs-sis.c
@@ -67,7 +67,7 @@ fs_sis_init(struct fs *_fs, const char *args, const struct fs_settings *set,
        return 0;
 }
 
-static void fs_sis_deinit(struct fs *_fs)
+static void fs_sis_free(struct fs *_fs)
 {
        struct sis_fs *fs = (struct sis_fs *)_fs;
 
@@ -332,7 +332,7 @@ const struct fs fs_class_sis = {
        .v = {
                fs_sis_alloc,
                fs_sis_init,
-               fs_sis_deinit,
+               fs_sis_free,
                fs_wrapper_get_properties,
                fs_sis_file_alloc,
                fs_sis_file_init,

diff --git a/src/lib-fs/fs-test.c b/src/lib-fs/fs-test.c
index 46881508aed4538d2ac9714cd161cbd425ed0b6a..2e4bbc304e72946dd7a6e3d33b382f832fab4ff7 100644 (file)
--- a/src/lib-fs/fs-test.c
+++ b/src/lib-fs/fs-test.c
@@ -24,7 +24,7 @@ fs_test_init(struct fs *_fs ATTR_UNUSED, const char *args ATTR_UNUSED,
        return 0;
 }
 
-static void fs_test_deinit(struct fs *_fs)
+static void fs_test_free(struct fs *_fs)
 {
        struct test_fs *fs = (struct test_fs *)_fs;
 
@@ -408,7 +408,7 @@ const struct fs fs_class_test = {
        .v = {
                fs_test_alloc,
                fs_test_init,
-               fs_test_deinit,
+               fs_test_free,
                fs_test_get_properties,
                fs_test_file_alloc,
                fs_test_file_init,

diff --git a/src/plugins/fs-compress/fs-compress.c b/src/plugins/fs-compress/fs-compress.c
index c99a31bd6b663b336ab4047c77578269f3185f13..18c100e5d2c1d5fd58353545bcd9d373e3d71fd4 100644 (file)
--- a/src/plugins/fs-compress/fs-compress.c
+++ b/src/plugins/fs-compress/fs-compress.c
@@ -96,7 +96,7 @@ fs_compress_init(struct fs *_fs, const char *args,
        return fs_init(parent_name, parent_args, set, &_fs->parent, error_r);
 }
 
-static void fs_compress_deinit(struct fs *_fs)
+static void fs_compress_free(struct fs *_fs)
 {
        struct compress_fs *fs = (struct compress_fs *)_fs;
 
@@ -278,7 +278,7 @@ const struct fs fs_class_compress = {
        .v = {
                fs_compress_alloc,
                fs_compress_init,
-               fs_compress_deinit,
+               fs_compress_free,
                fs_wrapper_get_properties,
                fs_compress_file_alloc,
                fs_compress_file_init,

diff --git a/src/plugins/mail-crypt/fs-crypt-common.c b/src/plugins/mail-crypt/fs-crypt-common.c
index 6b52ec7bccba48877c6ee1ecb274519e8333acf8..efb287a7f11f63fbb87dd9072a1820d2ee78ff89 100644 (file)
--- a/src/plugins/mail-crypt/fs-crypt-common.c
+++ b/src/plugins/mail-crypt/fs-crypt-common.c
@@ -116,7 +116,7 @@ fs_crypt_init(struct fs *_fs, const char *args, const struct fs_settings *set,
        return 0;
 }
 
-static void fs_crypt_deinit(struct fs *_fs)
+static void fs_crypt_free(struct fs *_fs)
 {
        struct crypt_fs *fs = (struct crypt_fs *)_fs;
 

diff --git a/src/plugins/mail-crypt/fs-crypt.c b/src/plugins/mail-crypt/fs-crypt.c
index c72c873e48cc8b6ce9852ef4c5aba0072419a368..514649c95910baac5c9510eb658966387d7d008c 100644 (file)
--- a/src/plugins/mail-crypt/fs-crypt.c
+++ b/src/plugins/mail-crypt/fs-crypt.c
@@ -30,7 +30,7 @@ const struct fs fs_class_crypt = {
        .v = {
                fs_crypt_alloc,
                fs_crypt_init,
-               fs_crypt_deinit,
+               fs_crypt_free,
                fs_wrapper_get_properties,
                fs_crypt_file_alloc,
                fs_crypt_file_init,

diff --git a/src/plugins/mail-crypt/fs-mail-crypt.c b/src/plugins/mail-crypt/fs-mail-crypt.c
index 28c6d24d9b38eb4b426f39117c0d2d89db38a0ae..dc3d60198cdb880911c1796eee56b6bff0e6dfbc 100644 (file)
--- a/src/plugins/mail-crypt/fs-mail-crypt.c
+++ b/src/plugins/mail-crypt/fs-mail-crypt.c
@@ -37,7 +37,7 @@ const struct fs fs_class_mail_crypt = {
        .v = {
                fs_crypt_alloc,
                fs_crypt_init,
-               fs_crypt_deinit,
+               fs_crypt_free,
                fs_wrapper_get_properties,
                fs_crypt_file_alloc,
                fs_crypt_file_init,