From 15b55d5c63d27f81776edb1abc05872a751fc674 Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Sun, 26 Jan 2020 13:27:51 +0200 Subject: [PATCH] xz: Move the setting of flush_needed in file_io.c to a nicer location. --- src/xz/file_io.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/xz/file_io.c b/src/xz/file_io.c index 6db62e76..a73efcb9 100644 --- a/src/xz/file_io.c +++ b/src/xz/file_io.c @@ -266,11 +266,8 @@ io_wait(file_pair *pair, int timeout, bool is_reading) return IO_WAIT_ERROR; } - if (ret == 0) { - assert(opt_flush_timeout != 0); - flush_needed = true; + if (ret == 0) return IO_WAIT_TIMEOUT; - } if (pfd[0].revents != 0) return IO_WAIT_MORE; @@ -1147,6 +1144,7 @@ io_read(file_pair *pair, io_buf *buf_union, size_t size) return SIZE_MAX; case IO_WAIT_TIMEOUT: + flush_needed = true; return size - left; default: