From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 31 May 2016 14:06:29 +0000 (+0300)
Subject: lib-fs: Don't duplicate backend name in fs_init() errors.
X-Git-Tag: 2.2.25.rc1~244
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b1bd5d406b1d05ba0c4e4babfbf8eb88c2cb7fa;p=thirdparty%2Fdovecot%2Fcore.git

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 ceb2b84b41..1102c21c33 100644
--- 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 c3132a53b0..4cff6671f1 100644
--- 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 8259f0f040..9b330229d0 100644
--- 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 bee09e7a96..1563c29592 100644
--- 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);