From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 15 Nov 2017 10:57:34 +0000 (+0200)
Subject: global: Replace o_stream_ignore_last_errors() with o_stream_abort() wherever possible
X-Git-Tag: 2.3.0.rc1~445
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a222deffd3f48e43aa61ceb73a4faeeeea5e12c;p=thirdparty%2Fdovecot%2Fcore.git

global: Replace o_stream_ignore_last_errors() with o_stream_abort() wherever possible
---

diff --git a/src/lib-fs/fs-api.c b/src/lib-fs/fs-api.c
index 472371dcea..b2683136d5 100644
--- a/src/lib-fs/fs-api.c
+++ b/src/lib-fs/fs-api.c
@@ -770,7 +770,7 @@ static void fs_write_stream_abort(struct fs_file *file, struct ostream **output)
 	i_assert(output != &file->output);
 
 	*output = NULL;
-	o_stream_ignore_last_errors(file->output);
+	o_stream_abort(file->output);
 	/* make sure we don't have an old error lying around */
 	ret = fs_write_stream_finish_int(file, FALSE);
 	i_assert(ret != 0);
diff --git a/src/lib-mail/test-istream-attachment.c b/src/lib-mail/test-istream-attachment.c
index 16529138c7..bad1bb1211 100644
--- a/src/lib-mail/test-istream-attachment.c
+++ b/src/lib-mail/test-istream-attachment.c
@@ -194,7 +194,7 @@ test_close_attachment_ostream_error(struct ostream *output,
 {
 	if (success)
 		*error = "test output error";
-	o_stream_ignore_last_errors(output);
+	o_stream_abort(output);
 	o_stream_destroy(&output);
 	return -1;
 }
diff --git a/src/lib-storage/index/dbox-common/dbox-file-fix.c b/src/lib-storage/index/dbox-common/dbox-file-fix.c
index 6ed7904d28..d9a472a44a 100644
--- a/src/lib-storage/index/dbox-common/dbox-file-fix.c
+++ b/src/lib-storage/index/dbox-common/dbox-file-fix.c
@@ -466,7 +466,7 @@ int dbox_file_fix(struct dbox_file *file, uoff_t start_offset)
 	o_stream_cork(output);
 	ret = dbox_file_fix_write_stream(file, start_offset, temp_path, output);
 	if (ret < 0)
-		o_stream_ignore_last_errors(output);
+		o_stream_abort(output);
 	have_messages = output->offset > file->file_header_size;
 	o_stream_unref(&output);
 	if (close(fd) < 0) {
diff --git a/src/lib-storage/index/dbox-common/dbox-file.c b/src/lib-storage/index/dbox-common/dbox-file.c
index c7220ff71f..1a02b15deb 100644
--- a/src/lib-storage/index/dbox-common/dbox-file.c
+++ b/src/lib-storage/index/dbox-common/dbox-file.c
@@ -534,7 +534,7 @@ void dbox_file_append_rollback(struct dbox_file_append_context **_ctx)
 			dbox_file_set_syscall_error(file, "ftruncate()");
 	}
 	if (ctx->output != NULL) {
-		o_stream_ignore_last_errors(ctx->output);
+		o_stream_abort(ctx->output);
 		o_stream_unref(&ctx->output);
 	}
 	i_free(ctx);
diff --git a/src/lib-storage/list/subscription-file.c b/src/lib-storage/list/subscription-file.c
index 4b3d866cd9..a736c635bd 100644
--- a/src/lib-storage/list/subscription-file.c
+++ b/src/lib-storage/list/subscription-file.c
@@ -242,7 +242,7 @@ int subsfile_set_subscribed(struct mailbox_list *list, const char *path,
 			}
 		}
 	} else {
-		o_stream_ignore_last_errors(output);
+		o_stream_abort(output);
 	}
 	o_stream_destroy(&output);
 
diff --git a/src/plugins/fts-squat/squat-uidlist.c b/src/plugins/fts-squat/squat-uidlist.c
index 991677aaf3..895c02c5b3 100644
--- a/src/plugins/fts-squat/squat-uidlist.c
+++ b/src/plugins/fts-squat/squat-uidlist.c
@@ -1074,13 +1074,14 @@ int squat_uidlist_rebuild_finish(struct squat_uidlist_rebuild_context *ctx,
 			ret = -1;
 		}
 		ctx->build_ctx->need_reopen = TRUE;
+	} else {
+		o_stream_abort(ctx->output);
 	}
 
 	/* we no longer require the entire uidlist to be in memory,
 	   let it be used for something more useful. */
 	squat_uidlist_free_from_memory(ctx->uidlist);
 
-	o_stream_ignore_last_errors(ctx->output);
 	o_stream_unref(&ctx->output);
 	if (close(ctx->fd) < 0)
 		i_error("close(%s) failed: %m", temp_path);