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 86cd98a30658105ecddc6519d57d28c78ad62fd1..909e2b0df8ee880894c62dcce5df1d32ec050612 100644 (file)
--- 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 e2219494f1dd2808aae8d3a849ec234d7cf595b5..8578199c6528a9bee6582664a2d942143f4e4f6d 100644 (file)
--- 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 f14ef697236ac00ae5bcaf49d0644fe900a0d632..576e2d6cd3e18dc16ef29442f29b040f273801df 100644 (file)
--- 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 5590830f01a5fc140deec58df45720555427e2b8..8a916b9583665a05b76a400de044b25b865eb782 100644 (file)
--- 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 cb4931ec323e2ba8f0f903d345186a3259afb82b..bc8a0b00960b848a399e1f3bbf5c7cf035cf20b2 100644 (file)
--- 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 9d8aa9e36fe8718df8ad4e8c507dfd88f0159457..9bf7aa41cb3b49d43ce06b05805fdbf1bfac6072 100644 (file)
--- 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 282818c3fa2bab143811db857867db429b95f12e..79461835debc284d70226ba0f0a58535fd551214 100644 (file)
--- 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 5256bba52a2a2cd54f1fb92b8bf41f402c95aaf3..6e51fab161d3dee721ddc8628497f7d8ab7f9b39 100644 (file)
--- 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;
 }