From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 25 Nov 2019 09:25:37 +0000 (+0200)
Subject: global: Replace fs_last_error() with fs_file_last_error() wherever possible
X-Git-Tag: 2.3.10~219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2763888017c89be12e41871f6ea910aeba602d3;p=thirdparty%2Fdovecot%2Fcore.git

global: Replace fs_last_error() with fs_file_last_error() wherever possible
---

diff --git a/src/doveadm/doveadm-fs.c b/src/doveadm/doveadm-fs.c
index 86cd98a306..909e2b0df8 100644
--- a/src/doveadm/doveadm-fs.c
+++ b/src/doveadm/doveadm-fs.c
@@ -169,11 +169,11 @@ static void cmd_fs_copy(int argc, char *argv[])
 	if (fs_copy(src_file, dest_file) == 0) ;
 	else if (errno == ENOENT) {
 		i_error("%s doesn't exist: %s", src_path,
-			fs_last_error(fs));
+			fs_file_last_error(dest_file));
 		doveadm_exit_code = DOVEADM_EX_NOTFOUND;
 	} else {
 		i_error("fs_copy(%s, %s) failed: %s",
-			src_path, dest_path, fs_last_error(fs));
+			src_path, dest_path, fs_file_last_error(dest_file));
 		doveadm_exit_code = EX_TEMPFAIL;
 	}
 	fs_file_deinit(&src_file);
diff --git a/src/lib-fs/fs-dict.c b/src/lib-fs/fs-dict.c
index e2219494f1..8578199c65 100644
--- a/src/lib-fs/fs-dict.c
+++ b/src/lib-fs/fs-dict.c
@@ -173,7 +173,7 @@ fs_dict_read_stream(struct fs_file *_file, size_t max_buffer_size ATTR_UNUSED)
 	struct istream *input;
 
 	if (fs_dict_lookup(file) < 0)
-		input = i_stream_create_error_str(errno, "%s", fs_last_error(_file->fs));
+		input = i_stream_create_error_str(errno, "%s", fs_file_last_error(_file));
 	else
 		input = i_stream_create_from_data(file->value, strlen(file->value));
 	i_stream_set_name(input, file->key);
diff --git a/src/lib-fs/fs-posix.c b/src/lib-fs/fs-posix.c
index f14ef69723..576e2d6cd3 100644
--- a/src/lib-fs/fs-posix.c
+++ b/src/lib-fs/fs-posix.c
@@ -453,7 +453,7 @@ fs_posix_read_stream(struct fs_file *_file, size_t max_buffer_size)
 	int fd_dup;
 
 	if (fs_posix_open_for_read(file) < 0)
-		input = i_stream_create_error_str(errno, "%s", fs_last_error(_file->fs));
+		input = i_stream_create_error_str(errno, "%s", fs_file_last_error(_file));
 	else if ((fd_dup = dup(file->fd)) == -1)
 		input = i_stream_create_error_str(errno, "dup() failed: %m");
 	else {
diff --git a/src/lib-fs/fs-sis-common.c b/src/lib-fs/fs-sis-common.c
index 5590830f01..8a916b9583 100644
--- a/src/lib-fs/fs-sis-common.c
+++ b/src/lib-fs/fs-sis-common.c
@@ -49,7 +49,7 @@ void fs_sis_try_unlink_hash_file(struct fs *sis_fs, struct fs_file *super_file)
 		    CMP_DEV_T(st1.st_dev, st2.st_dev)) {
 			if (fs_delete(hash_file) < 0) {
 				e_error(hash_file->event, "%s",
-					fs_last_error(hash_file->fs));
+					fs_file_last_error(hash_file));
 			}
 		}
 		fs_file_deinit(&hash_file);
diff --git a/src/lib-fs/fs-sis.c b/src/lib-fs/fs-sis.c
index cb4931ec32..bc8a0b0096 100644
--- a/src/lib-fs/fs-sis.c
+++ b/src/lib-fs/fs-sis.c
@@ -197,7 +197,7 @@ static void fs_sis_replace_hash_file(struct sis_fs_file *file)
 				   trying to deduplicate it anymore */
 			} else {
 				e_error(file->file.event, "%s",
-					fs_last_error(super_fs));
+					fs_file_last_error(file->hash_file));
 			}
 		}
 		return;
@@ -224,11 +224,11 @@ static void fs_sis_replace_hash_file(struct sis_fs_file *file)
 		   try to continue. */
 		if (fs_delete(temp_file) < 0 &&
 		    errno != ENOENT)
-			e_error(file->file.event, "%s", fs_last_error(super_fs));
+			e_error(file->file.event, "%s", fs_file_last_error(temp_file));
 		ret = fs_copy(file->file.parent, temp_file);
 	}
 	if (ret < 0) {
-		e_error(file->file.event, "%s", fs_last_error(super_fs));
+		e_error(file->file.event, "%s", fs_file_last_error(temp_file));
 		fs_file_deinit(&temp_file);
 		return;
 	}
@@ -237,7 +237,8 @@ static void fs_sis_replace_hash_file(struct sis_fs_file *file)
 		if (errno == ENOENT) {
 			/* apparently someone else just renamed it. ignore. */
 		} else {
-			e_error(file->file.event, "%s", fs_last_error(super_fs));
+			e_error(file->file.event, "%s",
+				fs_file_last_error(file->hash_file));
 		}
 		(void)fs_delete(temp_file);
 	}
diff --git a/src/lib-storage/index/dbox-single/sdbox-copy.c b/src/lib-storage/index/dbox-single/sdbox-copy.c
index 9d8aa9e36f..9bf7aa41cb 100644
--- a/src/lib-storage/index/dbox-single/sdbox-copy.c
+++ b/src/lib-storage/index/dbox-single/sdbox-copy.c
@@ -76,7 +76,7 @@ sdbox_file_copy_attachments(struct sdbox_file *src_file,
 					   FS_OPEN_MODE_READONLY);
 		if (fs_copy(src_fsfile, dest_fsfile) < 0) {
 			mailbox_set_critical(&dest_file->mbox->box, "%s",
-				fs_last_error(dest_storage->attachment_fs));
+				fs_file_last_error(dest_fsfile));
 			ret = -1;
 		} else {
 			array_push_back(&dest_file->attachment_paths,
diff --git a/src/lib-storage/index/dbox-single/sdbox-file.c b/src/lib-storage/index/dbox-single/sdbox-file.c
index 282818c3fa..79461835de 100644
--- a/src/lib-storage/index/dbox-single/sdbox-file.c
+++ b/src/lib-storage/index/dbox-single/sdbox-file.c
@@ -137,7 +137,7 @@ static int sdbox_file_rename_attachments(struct sdbox_file *file)
 					FS_OPEN_MODE_READONLY);
 		if (fs_rename(src_file, dest_file) < 0) {
 			mailbox_set_critical(&file->mbox->box, "%s",
-				fs_last_error(storage->attachment_fs));
+				fs_file_last_error(dest_file));
 			ret = -1;
 		}
 		fs_file_deinit(&src_file);
@@ -204,7 +204,7 @@ static int sdbox_file_unlink_aborted_save_attachments(struct sdbox_file *file)
 		if (fs_delete(fs_file) < 0 &&
 		    errno != ENOENT) {
 			mailbox_set_critical(&file->mbox->box, "%s",
-					     fs_last_error(fs));
+					     fs_file_last_error(fs_file));
 			ret = -1;
 		}
 		fs_file_deinit(&fs_file);
@@ -215,7 +215,7 @@ static int sdbox_file_unlink_aborted_save_attachments(struct sdbox_file *file)
 		if (fs_delete(fs_file) < 0 &&
 		    errno != ENOENT) {
 			mailbox_set_critical(&file->mbox->box, "%s",
-					     fs_last_error(fs));
+					     fs_file_last_error(fs_file));
 			ret = -1;
 		}
 		fs_file_deinit(&fs_file);
diff --git a/src/lib-storage/index/index-attachment.c b/src/lib-storage/index/index-attachment.c
index 5256bba52a..6e51fab161 100644
--- a/src/lib-storage/index/index-attachment.c
+++ b/src/lib-storage/index/index-attachment.c
@@ -279,7 +279,7 @@ index_attachment_delete_real(struct mail_storage *storage,
 	path = t_strdup_printf("%s/%s", index_attachment_dir_get(storage), name);
 	file = fs_file_init(fs, path, FS_OPEN_MODE_READONLY);
 	if ((ret = fs_delete(file)) < 0)
-		mail_storage_set_critical(storage, "%s", fs_last_error(fs));
+		mail_storage_set_critical(storage, "%s", fs_file_last_error(file));
 	fs_file_deinit(&file);
 	return ret;
 }