From 40c54675e2fd82588b0126f4db0b93cb821eab4a Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Sat, 28 Oct 2017 03:16:35 +0300
Subject: [PATCH] global: Replace o_stream_nfinish() with o_stream_finish

---
 src/lib-sieve-tool/sieve-tool.c | 2 +-
 src/lib-sieve/sieve.c           | 2 +-
 src/testsuite/testsuite-smtp.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib-sieve-tool/sieve-tool.c b/src/lib-sieve-tool/sieve-tool.c
index f4682069b..08aa22636 100644
--- a/src/lib-sieve-tool/sieve-tool.c
+++ b/src/lib-sieve-tool/sieve-tool.c
@@ -579,7 +579,7 @@ void sieve_tool_dump_binary_to
 			(void) sieve_hexdump(sbin, dumpstream);
 		else
 			(void) sieve_dump(sbin, dumpstream, FALSE);
-		if (o_stream_nfinish(dumpstream) < 0) {
+		if (o_stream_finish(dumpstream) < 0) {
 			i_fatal("write(%s) failed: %s", filename,
 				o_stream_get_error(dumpstream));
 		}
diff --git a/src/lib-sieve/sieve.c b/src/lib-sieve/sieve.c
index 231ff28ad..e85f0ee24 100644
--- a/src/lib-sieve/sieve.c
+++ b/src/lib-sieve/sieve.c
@@ -998,7 +998,7 @@ void sieve_trace_log_free(struct sieve_trace_log **_trace_log)
 
 	*_trace_log = NULL;
 
-	if (o_stream_nfinish(trace_log->output) < 0) {
+	if (o_stream_finish(trace_log->output) < 0) {
 		i_error("write(%s) failed: %s",
 			o_stream_get_name(trace_log->output),
 			o_stream_get_error(trace_log->output));
diff --git a/src/testsuite/testsuite-smtp.c b/src/testsuite/testsuite-smtp.c
index d03f16c48..76fa90975 100644
--- a/src/testsuite/testsuite-smtp.c
+++ b/src/testsuite/testsuite-smtp.c
@@ -141,7 +141,7 @@ int testsuite_smtp_finish
 	struct testsuite_smtp *smtp = (struct testsuite_smtp *) handle;
 	int ret = 1;
 
-	if (o_stream_nfinish(smtp->output) < 0) {
+	if (o_stream_finish(smtp->output) < 0) {
 		i_error("write(%s) failed: %s", smtp->msg_file,
 			o_stream_get_error(smtp->output));
 		ret = -1;