lib-fs: Don't duplicate backend name in fs_init() errors.

fs_init() already adds the "backend: " prefix to the error_r, so the callers
shouldn't do it again.

diff --git a/src/lib-fs/fs-metawrap.c b/src/lib-fs/fs-metawrap.c
index ceb2b84b41d2dbe2a503da335969ea340e4850f4..1102c21c33682fe1772eb3889555be1ddd7c2a8d 100644 (file)
--- a/src/lib-fs/fs-metawrap.c
+++ b/src/lib-fs/fs-metawrap.c
@@ -70,7 +70,7 @@ fs_metawrap_init(struct fs *_fs, const char *args, const
                parent_args++;
        }
        if (fs_init(parent_name, parent_args, set, &_fs->parent, &error) < 0) {
-               fs_set_error(_fs, "%s: %s", parent_name, error);
+               fs_set_error(_fs, "%s", error);
                return -1;
        }
        if ((fs_get_properties(_fs->parent) & FS_PROPERTY_METADATA) == 0)

diff --git a/src/lib-fs/fs-randomfail.c b/src/lib-fs/fs-randomfail.c
index c3132a53b0f432313d54dd946b458f22c063e754..4cff6671f1c1df768453cdf1ae59438e6a92d021 100644 (file)
--- a/src/lib-fs/fs-randomfail.c
+++ b/src/lib-fs/fs-randomfail.c
@@ -188,7 +188,7 @@ fs_randomfail_init(struct fs *_fs, const char *args,
                parent_args++;
        }
        if (fs_init(parent_name, parent_args, set, &_fs->parent, &error) < 0) {
-               fs_set_error(_fs, "%s: %s", parent_name, error);
+               fs_set_error(_fs, "%s", error);
                return -1;
        }
        return 0;

diff --git a/src/lib-fs/fs-sis-queue.c b/src/lib-fs/fs-sis-queue.c
index 8259f0f0400f4230d4ac40a9a2efa5bcc094de43..9b330229d0c7117da940b0f7e838bbcd36ffe68f 100644 (file)
--- a/src/lib-fs/fs-sis-queue.c
+++ b/src/lib-fs/fs-sis-queue.c
@@ -65,7 +65,7 @@ fs_sis_queue_init(struct fs *_fs, const char *args,
        else
                parent_name = t_strdup_until(parent_name, parent_args++);
        if (fs_init(parent_name, parent_args, set, &fs->super, &error) < 0) {
-               fs_set_error(_fs, "%s: %s", parent_name, error);
+               fs_set_error(_fs, "%s", error);
                return -1;
        }
        return 0;

diff --git a/src/lib-fs/fs-sis.c b/src/lib-fs/fs-sis.c
index bee09e7a96ade429c8615937ad12c57eb2093687..1563c29592acaf7b1354354fb1280a15c3f623bc 100644 (file)
--- a/src/lib-fs/fs-sis.c
+++ b/src/lib-fs/fs-sis.c
@@ -71,7 +71,7 @@ fs_sis_init(struct fs *_fs, const char *args, const struct fs_settings *set)
                parent_args++;
        }
        if (fs_init(parent_name, parent_args, set, &fs->super, &error) < 0) {
-               fs_set_error(_fs, "%s: %s", parent_name, error);
+               fs_set_error(_fs, "%s", error);
                return -1;
        }
        props = fs_get_properties(fs->super);