changeset 20226:2fe183522f0e

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.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Tue, 31 May 2016 17:06:29 +0300
parents d7f5154677c2
children 6d553b24dcf6
files src/lib-fs/fs-metawrap.c src/lib-fs/fs-randomfail.c src/lib-fs/fs-sis-queue.c src/lib-fs/fs-sis.c
diffstat 4 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-fs/fs-metawrap.c	Mon May 30 22:39:39 2016 +0300
+++ b/src/lib-fs/fs-metawrap.c	Tue May 31 17:06:29 2016 +0300
@@ -70,7 +70,7 @@
 		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)
--- a/src/lib-fs/fs-randomfail.c	Mon May 30 22:39:39 2016 +0300
+++ b/src/lib-fs/fs-randomfail.c	Tue May 31 17:06:29 2016 +0300
@@ -188,7 +188,7 @@
 		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;
--- a/src/lib-fs/fs-sis-queue.c	Mon May 30 22:39:39 2016 +0300
+++ b/src/lib-fs/fs-sis-queue.c	Tue May 31 17:06:29 2016 +0300
@@ -65,7 +65,7 @@
 	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;
--- a/src/lib-fs/fs-sis.c	Mon May 30 22:39:39 2016 +0300
+++ b/src/lib-fs/fs-sis.c	Tue May 31 17:06:29 2016 +0300
@@ -71,7 +71,7 @@
 		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);