# HG changeset patch
# User Timo Sirainen <timo.sirainen@dovecot.fi>
# Date 1467731553 -10800
# Node ID eae8e0a6bf2e20cbb1b0820f0393bf4a36bb2d9f
# Parent  c97e2a2d88b16847a414e1c34a1eb8796f31955d
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 -r c97e2a2d88b1 -r eae8e0a6bf2e src/lib-fs/fs-sis-queue.c
--- a/src/lib-fs/fs-sis-queue.c	Tue Jul 05 18:03:36 2016 +0300
+++ b/src/lib-fs/fs-sis-queue.c	Tue Jul 05 18:12:33 2016 +0300
@@ -188,7 +188,7 @@
 	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 -r c97e2a2d88b1 -r eae8e0a6bf2e src/lib-fs/fs-sis.c
--- a/src/lib-fs/fs-sis.c	Tue Jul 05 18:03:36 2016 +0300
+++ b/src/lib-fs/fs-sis.c	Tue Jul 05 18:12:33 2016 +0300
@@ -219,20 +219,20 @@
 	/* 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;