revi-archive/xz-archive
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2024-04-04 12:36:23 +02:00
Code Activity

xz: coder.c: Make writing output a separate function.

Browse source 
The same code sequence repeats so it's nicer as a separate function.
Note that in one case there was no test for opt_mode != MODE_TEST,
but that was only because that condition would always be true, so
this commit doesn't change the behavior there.
This commit is contained in:
Lasse Collin 2020-01-26 14:49:22 +02:00
parent 5a49e081a0
commit 8150356810
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/xz/coder.c
View file

@ -612,6 +612,20 @@ split_block(uint64_t *block_remaining,
} }
static bool
coder_write_output(file_pair *pair)
{
if (opt_mode != MODE_TEST) {
if (io_write(pair, &out_buf, IO_BUFFER_SIZE - strm.avail_out))
return true;
}
strm.next_out = out_buf.u8;
strm.avail_out = IO_BUFFER_SIZE;
return false;
}
/// Compress or decompress using liblzma. /// Compress or decompress using liblzma.
static bool static bool
coder_normal(file_pair *pair) coder_normal(file_pair *pair)
@ -706,12 +720,8 @@ coder_normal(file_pair *pair)
// Write out if the output buffer became full. // Write out if the output buffer became full.
if (strm.avail_out == 0) { if (strm.avail_out == 0) {
if (opt_mode != MODE_TEST && io_write(pair, &out_buf, if (coder_write_output(pair))
IO_BUFFER_SIZE - strm.avail_out))
break; break;
strm.next_out = out_buf.u8;
strm.avail_out = IO_BUFFER_SIZE;
} }
if (ret == LZMA_STREAM_END && (action == LZMA_SYNC_FLUSH if (ret == LZMA_STREAM_END && (action == LZMA_SYNC_FLUSH
@ -720,13 +730,9 @@ coder_normal(file_pair *pair)
// Flushing completed. Write the pending data // Flushing completed. Write the pending data
// out immediately so that the reading side // out immediately so that the reading side
// can decompress everything compressed so far. // can decompress everything compressed so far.
if (io_write(pair, &out_buf, IO_BUFFER_SIZE if (coder_write_output(pair))
- strm.avail_out))
break; break;
strm.next_out = out_buf.u8;
strm.avail_out = IO_BUFFER_SIZE;
// Set the time of the most recent flushing. // Set the time of the most recent flushing.
mytime_set_flush_time(); mytime_set_flush_time();
@ -762,9 +768,7 @@ coder_normal(file_pair *pair)
// as much data as possible, which can be good // as much data as possible, which can be good
// when trying to get at least some useful // when trying to get at least some useful
// data out of damaged files. // data out of damaged files.
if (opt_mode != MODE_TEST && io_write(pair, if (coder_write_output(pair))
&out_buf, IO_BUFFER_SIZE
- strm.avail_out))
break; break;
} }