From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 2 Dec 2019 19:19:04 +0000 (+0200)
Subject: fs-compress, fs-crypt: Remove duplicate fs-driver prefix in init errors
X-Git-Tag: 2.3.10~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=192b4fe4e9e8c2674e354a87d6bbcb3a3ceb859a;p=thirdparty%2Fdovecot%2Fcore.git

fs-compress, fs-crypt: Remove duplicate fs-driver prefix in init errors

fs_init() already prefixes the error with "fs-driver: "
---

diff --git a/src/plugins/fs-compress/fs-compress.c b/src/plugins/fs-compress/fs-compress.c
index b398e467a9..0786285972 100644
--- a/src/plugins/fs-compress/fs-compress.c
+++ b/src/plugins/fs-compress/fs-compress.c
@@ -44,7 +44,7 @@ fs_compress_init(struct fs *_fs, const char *args,
 		 const struct fs_settings *set, const char **error_r)
 {
 	struct compress_fs *fs = (struct compress_fs *)_fs;
-	const char *p, *compression_name, *level_str, *error;
+	const char *p, *compression_name, *level_str;
 	const char *parent_name, *parent_args;
 
 	/* get compression handler name */
@@ -92,11 +92,7 @@ fs_compress_init(struct fs *_fs, const char *args,
 		parent_name = t_strdup_until(args, parent_args);
 		parent_args++;
 	}
-	if (fs_init(parent_name, parent_args, set, &_fs->parent, &error) < 0) {
-		*error_r = t_strdup_printf("%s: %s", parent_name, error);
-		return -1;
-	}
-	return 0;
+	return fs_init(parent_name, parent_args, set, &_fs->parent, error_r);
 }
 
 static void fs_compress_deinit(struct fs *_fs)
diff --git a/src/plugins/mail-crypt/fs-crypt-common.c b/src/plugins/mail-crypt/fs-crypt-common.c
index 0a56bf15f5..c46b5c4ffa 100644
--- a/src/plugins/mail-crypt/fs-crypt-common.c
+++ b/src/plugins/mail-crypt/fs-crypt-common.c
@@ -106,10 +106,8 @@ fs_crypt_init(struct fs *_fs, const char *args, const struct fs_settings *set,
 		parent_name = t_strdup_until(args, parent_args);
 		parent_args++;
 	}
-	if (fs_init(parent_name, parent_args, set, &_fs->parent, &error) < 0) {
-		*error_r = t_strdup_printf("%s: %s", parent_name, error);
+	if (fs_init(parent_name, parent_args, set, &_fs->parent, error_r) < 0)
 		return -1;
-	}
 	fs->enc_algo = i_strdup(enc_algo);
 	fs->set_prefix = i_strdup(set_prefix);
 	fs->public_key_path = i_strdup_empty(public_key_path);