fs-sis*: Minor error handling function cleanups.

We don't really need to go to the parent fs, so just use what is easiest.

diff --git a/src/lib-fs/fs-sis-queue.c b/src/lib-fs/fs-sis-queue.c
index 0de1b14cffdf00f1b4c2e27021f8f3ee9725e539..345415df5b2f129e58902ffeeb3ad767d83668d9 100644 (file)
--- a/src/lib-fs/fs-sis-queue.c
+++ b/src/lib-fs/fs-sis-queue.c
@@ -188,7 +188,7 @@ static void fs_sis_queue_add(struct sis_queue_fs_file *file)
        queue_path = t_strdup_printf("%s/%s", fs->queue_dir, fname);
        queue_file = fs_file_init(fs->fs.parent, queue_path, FS_OPEN_MODE_CREATE);
        if (fs_write(queue_file, "", 0) < 0 && errno != EEXIST)
-               i_error("fs-sis-queue: %s", fs_last_error(fs->fs.parent));
+               i_error("fs-sis-queue: %s", fs_file_last_error(queue_file));
        fs_file_deinit(&queue_file);
 }
 

diff --git a/src/lib-fs/fs-sis.c b/src/lib-fs/fs-sis.c
index 221d66cc180ec8431a58cf686ea643e4aa9e5e9b..1c276e207d4431fda51c9fd8048550cf1d20fc67 100644 (file)
--- a/src/lib-fs/fs-sis.c
+++ b/src/lib-fs/fs-sis.c
@@ -219,20 +219,20 @@ static bool fs_sis_try_link(struct sis_fs_file *file)
        /* we can use the existing file */
        if (fs_copy(file->hash_file, file->super) < 0) {
                if (errno != ENOENT && errno != EMLINK)
-                       i_error("fs-sis: %s", fs_last_error(file->super->fs));
+                       i_error("fs-sis: %s", fs_file_last_error(file->hash_file));
                /* failed to use link(), continue as if it hadn't been equal */
                return FALSE;
        }
        if (fs_stat(file->super, &st2) < 0) {
-               i_error("fs-sis: %s", fs_last_error(file->super->fs));
+               i_error("fs-sis: %s", fs_file_last_error(file->super));
                if (fs_delete(file->super) < 0)
-                       i_error("fs-sis: %s", fs_last_error(file->super->fs));
+                       i_error("fs-sis: %s", fs_file_last_error(file->super));
                return FALSE;
        }
        if (st->st_ino != st2.st_ino) {
                /* the hashes/ file was already replaced with something else */
                if (fs_delete(file->super) < 0)
-                       i_error("fs-sis: %s", fs_last_error(file->super->fs));
+                       i_error("fs-sis: %s", fs_file_last_error(file->super));
                return FALSE;
        }
        return TRUE;