mirror of https://git.tukaani.org/xz.git
Replace "Fall through" comments with FALLTHROUGH
This commit is contained in:
parent
f31c3a6647
commit
94adc996e4
|
@ -134,8 +134,7 @@ alone_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
|
|
||||||
coder->pos = 0;
|
coder->pos = 0;
|
||||||
coder->sequence = SEQ_CODER_INIT;
|
coder->sequence = SEQ_CODER_INIT;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_CODER_INIT: {
|
case SEQ_CODER_INIT: {
|
||||||
if (coder->memusage > coder->memlimit)
|
if (coder->memusage > coder->memlimit)
|
||||||
|
|
|
@ -79,7 +79,7 @@ auto_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
return LZMA_GET_CHECK;
|
return LZMA_GET_CHECK;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
FALLTHROUGH;
|
||||||
|
|
||||||
case SEQ_CODE: {
|
case SEQ_CODE: {
|
||||||
const lzma_ret ret = coder->next.code(
|
const lzma_ret ret = coder->next.code(
|
||||||
|
@ -91,10 +91,9 @@ auto_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
coder->sequence = SEQ_FINISH;
|
coder->sequence = SEQ_FINISH;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_FINISH:
|
case SEQ_FINISH:
|
||||||
// When LZMA_CONCATENATED was used and we were decoding
|
// When LZMA_CONCATENATED was used and we were decoding
|
||||||
// a LZMA_Alone file, we need to check that there is no
|
// a LZMA_Alone file, we need to check that there is no
|
||||||
|
|
|
@ -146,10 +146,9 @@ block_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
coder->block->uncompressed_size = coder->uncompressed_size;
|
coder->block->uncompressed_size = coder->uncompressed_size;
|
||||||
|
|
||||||
coder->sequence = SEQ_PADDING;
|
coder->sequence = SEQ_PADDING;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_PADDING:
|
case SEQ_PADDING:
|
||||||
// Compressed Data is padded to a multiple of four bytes.
|
// Compressed Data is padded to a multiple of four bytes.
|
||||||
while (coder->compressed_size & 3) {
|
while (coder->compressed_size & 3) {
|
||||||
|
@ -173,8 +172,7 @@ block_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
lzma_check_finish(&coder->check, coder->block->check);
|
lzma_check_finish(&coder->check, coder->block->check);
|
||||||
|
|
||||||
coder->sequence = SEQ_CHECK;
|
coder->sequence = SEQ_CHECK;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_CHECK: {
|
case SEQ_CHECK: {
|
||||||
const size_t check_size = lzma_check_size(coder->block->check);
|
const size_t check_size = lzma_check_size(coder->block->check);
|
||||||
|
|
|
@ -94,10 +94,9 @@ block_encode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
coder->block->uncompressed_size = coder->uncompressed_size;
|
coder->block->uncompressed_size = coder->uncompressed_size;
|
||||||
|
|
||||||
coder->sequence = SEQ_PADDING;
|
coder->sequence = SEQ_PADDING;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_PADDING:
|
case SEQ_PADDING:
|
||||||
// Pad Compressed Data to a multiple of four bytes. We can
|
// Pad Compressed Data to a multiple of four bytes. We can
|
||||||
// use coder->compressed_size for this since we don't need
|
// use coder->compressed_size for this since we don't need
|
||||||
|
@ -117,8 +116,7 @@ block_encode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
lzma_check_finish(&coder->check, coder->block->check);
|
lzma_check_finish(&coder->check, coder->block->check);
|
||||||
|
|
||||||
coder->sequence = SEQ_CHECK;
|
coder->sequence = SEQ_CHECK;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_CHECK: {
|
case SEQ_CHECK: {
|
||||||
const size_t check_size = lzma_check_size(coder->block->check);
|
const size_t check_size = lzma_check_size(coder->block->check);
|
||||||
|
|
|
@ -348,7 +348,7 @@ lzma_code(lzma_stream *strm, lzma_action action)
|
||||||
else
|
else
|
||||||
strm->internal->sequence = ISEQ_END;
|
strm->internal->sequence = ISEQ_END;
|
||||||
|
|
||||||
// Fall through
|
FALLTHROUGH;
|
||||||
|
|
||||||
case LZMA_NO_CHECK:
|
case LZMA_NO_CHECK:
|
||||||
case LZMA_UNSUPPORTED_CHECK:
|
case LZMA_UNSUPPORTED_CHECK:
|
||||||
|
|
|
@ -298,15 +298,13 @@ file_info_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
// Start looking for Stream Padding and Stream Footer
|
// Start looking for Stream Padding and Stream Footer
|
||||||
// at the end of the file.
|
// at the end of the file.
|
||||||
coder->file_target_pos = coder->file_size;
|
coder->file_target_pos = coder->file_size;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_PADDING_SEEK:
|
case SEQ_PADDING_SEEK:
|
||||||
coder->sequence = SEQ_PADDING_DECODE;
|
coder->sequence = SEQ_PADDING_DECODE;
|
||||||
return_if_error(reverse_seek(
|
return_if_error(reverse_seek(
|
||||||
coder, in_start, in_pos, in_size));
|
coder, in_start, in_pos, in_size));
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_PADDING_DECODE: {
|
case SEQ_PADDING_DECODE: {
|
||||||
// Copy to coder->temp first. This keeps the code simpler if
|
// Copy to coder->temp first. This keeps the code simpler if
|
||||||
|
@ -356,9 +354,9 @@ file_info_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
if (coder->temp_size < LZMA_STREAM_HEADER_SIZE)
|
if (coder->temp_size < LZMA_STREAM_HEADER_SIZE)
|
||||||
return_if_error(reverse_seek(
|
return_if_error(reverse_seek(
|
||||||
coder, in_start, in_pos, in_size));
|
coder, in_start, in_pos, in_size));
|
||||||
}
|
|
||||||
|
|
||||||
// Fall through
|
FALLTHROUGH;
|
||||||
|
}
|
||||||
|
|
||||||
case SEQ_FOOTER:
|
case SEQ_FOOTER:
|
||||||
// Copy the Stream Footer field into coder->temp.
|
// Copy the Stream Footer field into coder->temp.
|
||||||
|
@ -414,7 +412,7 @@ file_info_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
return LZMA_SEEK_NEEDED;
|
return LZMA_SEEK_NEEDED;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
FALLTHROUGH;
|
||||||
|
|
||||||
case SEQ_INDEX_INIT: {
|
case SEQ_INDEX_INIT: {
|
||||||
// Calculate the amount of memory already used by the earlier
|
// Calculate the amount of memory already used by the earlier
|
||||||
|
@ -444,10 +442,9 @@ file_info_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
|
|
||||||
coder->index_remaining = coder->footer_flags.backward_size;
|
coder->index_remaining = coder->footer_flags.backward_size;
|
||||||
coder->sequence = SEQ_INDEX_DECODE;
|
coder->sequence = SEQ_INDEX_DECODE;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_INDEX_DECODE: {
|
case SEQ_INDEX_DECODE: {
|
||||||
// Decode (a part of) the Index. If the whole Index is already
|
// Decode (a part of) the Index. If the whole Index is already
|
||||||
// in coder->temp, read it from there. Otherwise read from
|
// in coder->temp, read it from there. Otherwise read from
|
||||||
|
@ -574,9 +571,9 @@ file_info_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
return_if_error(reverse_seek(coder,
|
return_if_error(reverse_seek(coder,
|
||||||
in_start, in_pos, in_size));
|
in_start, in_pos, in_size));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Fall through
|
FALLTHROUGH;
|
||||||
|
}
|
||||||
|
|
||||||
case SEQ_HEADER_DECODE:
|
case SEQ_HEADER_DECODE:
|
||||||
// Copy the Stream Header field into coder->temp.
|
// Copy the Stream Header field into coder->temp.
|
||||||
|
@ -596,8 +593,7 @@ file_info_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
coder->temp + coder->temp_size)));
|
coder->temp + coder->temp_size)));
|
||||||
|
|
||||||
coder->sequence = SEQ_HEADER_COMPARE;
|
coder->sequence = SEQ_HEADER_COMPARE;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_HEADER_COMPARE:
|
case SEQ_HEADER_COMPARE:
|
||||||
// Compare Stream Header against Stream Footer. They must
|
// Compare Stream Header against Stream Footer. They must
|
||||||
|
|
|
@ -93,8 +93,7 @@ index_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
|
|
||||||
coder->pos = 0;
|
coder->pos = 0;
|
||||||
coder->sequence = SEQ_MEMUSAGE;
|
coder->sequence = SEQ_MEMUSAGE;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_MEMUSAGE:
|
case SEQ_MEMUSAGE:
|
||||||
if (lzma_index_memusage(1, coder->count) > coder->memlimit) {
|
if (lzma_index_memusage(1, coder->count) > coder->memlimit) {
|
||||||
|
@ -153,8 +152,7 @@ index_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
case SEQ_PADDING_INIT:
|
case SEQ_PADDING_INIT:
|
||||||
coder->pos = lzma_index_padding_size(coder->index);
|
coder->pos = lzma_index_padding_size(coder->index);
|
||||||
coder->sequence = SEQ_PADDING;
|
coder->sequence = SEQ_PADDING;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_PADDING:
|
case SEQ_PADDING:
|
||||||
if (coder->pos > 0) {
|
if (coder->pos > 0) {
|
||||||
|
@ -170,8 +168,7 @@ index_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
*in_pos - in_start, coder->crc32);
|
*in_pos - in_start, coder->crc32);
|
||||||
|
|
||||||
coder->sequence = SEQ_CRC32;
|
coder->sequence = SEQ_CRC32;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_CRC32:
|
case SEQ_CRC32:
|
||||||
do {
|
do {
|
||||||
|
|
|
@ -93,8 +93,7 @@ index_encode(void *coder_ptr,
|
||||||
}
|
}
|
||||||
|
|
||||||
coder->sequence = SEQ_UNPADDED;
|
coder->sequence = SEQ_UNPADDED;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_UNPADDED:
|
case SEQ_UNPADDED:
|
||||||
case SEQ_UNCOMPRESSED: {
|
case SEQ_UNCOMPRESSED: {
|
||||||
|
@ -127,8 +126,7 @@ index_encode(void *coder_ptr,
|
||||||
*out_pos - out_start, coder->crc32);
|
*out_pos - out_start, coder->crc32);
|
||||||
|
|
||||||
coder->sequence = SEQ_CRC32;
|
coder->sequence = SEQ_CRC32;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_CRC32:
|
case SEQ_CRC32:
|
||||||
// We don't use the main loop, because we don't want
|
// We don't use the main loop, because we don't want
|
||||||
|
|
|
@ -267,9 +267,9 @@ lzma_index_hash_decode(lzma_index_hash *index_hash, const uint8_t *in,
|
||||||
index_hash->pos = (LZMA_VLI_C(4) - index_size_unpadded(
|
index_hash->pos = (LZMA_VLI_C(4) - index_size_unpadded(
|
||||||
index_hash->records.count,
|
index_hash->records.count,
|
||||||
index_hash->records.index_list_size)) & 3;
|
index_hash->records.index_list_size)) & 3;
|
||||||
index_hash->sequence = SEQ_PADDING;
|
|
||||||
|
|
||||||
// Fall through
|
index_hash->sequence = SEQ_PADDING;
|
||||||
|
FALLTHROUGH;
|
||||||
|
|
||||||
case SEQ_PADDING:
|
case SEQ_PADDING:
|
||||||
if (index_hash->pos > 0) {
|
if (index_hash->pos > 0) {
|
||||||
|
@ -302,8 +302,7 @@ lzma_index_hash_decode(lzma_index_hash *index_hash, const uint8_t *in,
|
||||||
*in_pos - in_start, index_hash->crc32);
|
*in_pos - in_start, index_hash->crc32);
|
||||||
|
|
||||||
index_hash->sequence = SEQ_CRC32;
|
index_hash->sequence = SEQ_CRC32;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_CRC32:
|
case SEQ_CRC32:
|
||||||
do {
|
do {
|
||||||
|
|
|
@ -150,10 +150,9 @@ lzip_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
coder->member_size = sizeof(lzip_id_string);
|
coder->member_size = sizeof(lzip_id_string);
|
||||||
|
|
||||||
coder->sequence = SEQ_VERSION;
|
coder->sequence = SEQ_VERSION;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_VERSION:
|
case SEQ_VERSION:
|
||||||
if (*in_pos >= in_size)
|
if (*in_pos >= in_size)
|
||||||
return LZMA_OK;
|
return LZMA_OK;
|
||||||
|
@ -173,7 +172,7 @@ lzip_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
if (coder->tell_any_check)
|
if (coder->tell_any_check)
|
||||||
return LZMA_GET_CHECK;
|
return LZMA_GET_CHECK;
|
||||||
|
|
||||||
// Fall through
|
FALLTHROUGH;
|
||||||
|
|
||||||
case SEQ_DICT_SIZE: {
|
case SEQ_DICT_SIZE: {
|
||||||
if (*in_pos >= in_size)
|
if (*in_pos >= in_size)
|
||||||
|
@ -220,10 +219,9 @@ lzip_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
// LZMA_MEMLIMIT_ERROR we need to be able to restart after
|
// LZMA_MEMLIMIT_ERROR we need to be able to restart after
|
||||||
// the memlimit has been increased.
|
// the memlimit has been increased.
|
||||||
coder->sequence = SEQ_CODER_INIT;
|
coder->sequence = SEQ_CODER_INIT;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_CODER_INIT: {
|
case SEQ_CODER_INIT: {
|
||||||
if (coder->memusage > coder->memlimit)
|
if (coder->memusage > coder->memlimit)
|
||||||
return LZMA_MEMLIMIT_ERROR;
|
return LZMA_MEMLIMIT_ERROR;
|
||||||
|
@ -243,10 +241,9 @@ lzip_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
|
|
||||||
coder->crc32 = 0;
|
coder->crc32 = 0;
|
||||||
coder->sequence = SEQ_LZMA_STREAM;
|
coder->sequence = SEQ_LZMA_STREAM;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_LZMA_STREAM: {
|
case SEQ_LZMA_STREAM: {
|
||||||
const size_t in_start = *in_pos;
|
const size_t in_start = *in_pos;
|
||||||
const size_t out_start = *out_pos;
|
const size_t out_start = *out_pos;
|
||||||
|
@ -273,10 +270,9 @@ lzip_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
coder->sequence = SEQ_MEMBER_FOOTER;
|
coder->sequence = SEQ_MEMBER_FOOTER;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_MEMBER_FOOTER: {
|
case SEQ_MEMBER_FOOTER: {
|
||||||
// The footer of .lz version 0 lacks the Member size field.
|
// The footer of .lz version 0 lacks the Member size field.
|
||||||
// This is the only difference between version 0 and
|
// This is the only difference between version 0 and
|
||||||
|
|
|
@ -154,9 +154,9 @@ stream_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
|
|
||||||
if (coder->tell_any_check)
|
if (coder->tell_any_check)
|
||||||
return LZMA_GET_CHECK;
|
return LZMA_GET_CHECK;
|
||||||
}
|
|
||||||
|
|
||||||
// Fall through
|
FALLTHROUGH;
|
||||||
|
}
|
||||||
|
|
||||||
case SEQ_BLOCK_HEADER: {
|
case SEQ_BLOCK_HEADER: {
|
||||||
if (*in_pos >= in_size)
|
if (*in_pos >= in_size)
|
||||||
|
@ -187,10 +187,9 @@ stream_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
|
|
||||||
coder->pos = 0;
|
coder->pos = 0;
|
||||||
coder->sequence = SEQ_BLOCK_INIT;
|
coder->sequence = SEQ_BLOCK_INIT;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_BLOCK_INIT: {
|
case SEQ_BLOCK_INIT: {
|
||||||
// Checking memusage and doing the initialization needs
|
// Checking memusage and doing the initialization needs
|
||||||
// its own sequence point because we need to be able to
|
// its own sequence point because we need to be able to
|
||||||
|
@ -252,10 +251,9 @@ stream_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
coder->sequence = SEQ_BLOCK_RUN;
|
coder->sequence = SEQ_BLOCK_RUN;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_BLOCK_RUN: {
|
case SEQ_BLOCK_RUN: {
|
||||||
const lzma_ret ret = coder->block_decoder.code(
|
const lzma_ret ret = coder->block_decoder.code(
|
||||||
coder->block_decoder.coder, allocator,
|
coder->block_decoder.coder, allocator,
|
||||||
|
@ -291,10 +289,9 @@ stream_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
coder->sequence = SEQ_STREAM_FOOTER;
|
coder->sequence = SEQ_STREAM_FOOTER;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_STREAM_FOOTER: {
|
case SEQ_STREAM_FOOTER: {
|
||||||
// Copy the Stream Footer to the internal buffer.
|
// Copy the Stream Footer to the internal buffer.
|
||||||
lzma_bufcpy(in, in_pos, in_size, coder->buffer, &coder->pos,
|
lzma_bufcpy(in, in_pos, in_size, coder->buffer, &coder->pos,
|
||||||
|
@ -331,10 +328,9 @@ stream_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
return LZMA_STREAM_END;
|
return LZMA_STREAM_END;
|
||||||
|
|
||||||
coder->sequence = SEQ_STREAM_PADDING;
|
coder->sequence = SEQ_STREAM_PADDING;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_STREAM_PADDING:
|
case SEQ_STREAM_PADDING:
|
||||||
assert(coder->concatenated);
|
assert(coder->concatenated);
|
||||||
|
|
||||||
|
|
|
@ -1077,9 +1077,9 @@ stream_decode_mt(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
|
|
||||||
if (coder->tell_any_check)
|
if (coder->tell_any_check)
|
||||||
return LZMA_GET_CHECK;
|
return LZMA_GET_CHECK;
|
||||||
}
|
|
||||||
|
|
||||||
// Fall through
|
FALLTHROUGH;
|
||||||
|
}
|
||||||
|
|
||||||
case SEQ_BLOCK_HEADER: {
|
case SEQ_BLOCK_HEADER: {
|
||||||
const size_t in_old = *in_pos;
|
const size_t in_old = *in_pos;
|
||||||
|
@ -1214,10 +1214,9 @@ stream_decode_mt(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
}
|
}
|
||||||
|
|
||||||
coder->sequence = SEQ_BLOCK_INIT;
|
coder->sequence = SEQ_BLOCK_INIT;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_BLOCK_INIT: {
|
case SEQ_BLOCK_INIT: {
|
||||||
// Check if decoding is possible at all with the current
|
// Check if decoding is possible at all with the current
|
||||||
// memlimit_stop which we must never exceed.
|
// memlimit_stop which we must never exceed.
|
||||||
|
@ -1303,10 +1302,9 @@ stream_decode_mt(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
}
|
}
|
||||||
|
|
||||||
coder->sequence = SEQ_BLOCK_THR_INIT;
|
coder->sequence = SEQ_BLOCK_THR_INIT;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_BLOCK_THR_INIT: {
|
case SEQ_BLOCK_THR_INIT: {
|
||||||
// We need to wait for a multiple conditions to become true
|
// We need to wait for a multiple conditions to become true
|
||||||
// until we can initialize the Block decoder and let a worker
|
// until we can initialize the Block decoder and let a worker
|
||||||
|
@ -1508,10 +1506,9 @@ stream_decode_mt(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
}
|
}
|
||||||
|
|
||||||
coder->sequence = SEQ_BLOCK_THR_RUN;
|
coder->sequence = SEQ_BLOCK_THR_RUN;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_BLOCK_THR_RUN: {
|
case SEQ_BLOCK_THR_RUN: {
|
||||||
if (action == LZMA_FINISH && coder->fail_fast) {
|
if (action == LZMA_FINISH && coder->fail_fast) {
|
||||||
// We know that we won't get more input and that
|
// We know that we won't get more input and that
|
||||||
|
@ -1613,10 +1610,9 @@ stream_decode_mt(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
coder->mem_direct_mode = coder->mem_next_filters;
|
coder->mem_direct_mode = coder->mem_next_filters;
|
||||||
|
|
||||||
coder->sequence = SEQ_BLOCK_DIRECT_RUN;
|
coder->sequence = SEQ_BLOCK_DIRECT_RUN;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_BLOCK_DIRECT_RUN: {
|
case SEQ_BLOCK_DIRECT_RUN: {
|
||||||
const size_t in_old = *in_pos;
|
const size_t in_old = *in_pos;
|
||||||
const size_t out_old = *out_pos;
|
const size_t out_old = *out_pos;
|
||||||
|
@ -1652,8 +1648,7 @@ stream_decode_mt(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
return LZMA_OK;
|
return LZMA_OK;
|
||||||
|
|
||||||
coder->sequence = SEQ_INDEX_DECODE;
|
coder->sequence = SEQ_INDEX_DECODE;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_INDEX_DECODE: {
|
case SEQ_INDEX_DECODE: {
|
||||||
// If we don't have any input, don't call
|
// If we don't have any input, don't call
|
||||||
|
@ -1672,10 +1667,9 @@ stream_decode_mt(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
coder->sequence = SEQ_STREAM_FOOTER;
|
coder->sequence = SEQ_STREAM_FOOTER;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_STREAM_FOOTER: {
|
case SEQ_STREAM_FOOTER: {
|
||||||
// Copy the Stream Footer to the internal buffer.
|
// Copy the Stream Footer to the internal buffer.
|
||||||
const size_t in_old = *in_pos;
|
const size_t in_old = *in_pos;
|
||||||
|
@ -1714,10 +1708,9 @@ stream_decode_mt(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
return LZMA_STREAM_END;
|
return LZMA_STREAM_END;
|
||||||
|
|
||||||
coder->sequence = SEQ_STREAM_PADDING;
|
coder->sequence = SEQ_STREAM_PADDING;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_STREAM_PADDING:
|
case SEQ_STREAM_PADDING:
|
||||||
assert(coder->concatenated);
|
assert(coder->concatenated);
|
||||||
|
|
||||||
|
|
|
@ -731,8 +731,7 @@ stream_encode_mt(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
|
|
||||||
coder->header_pos = 0;
|
coder->header_pos = 0;
|
||||||
coder->sequence = SEQ_BLOCK;
|
coder->sequence = SEQ_BLOCK;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_BLOCK: {
|
case SEQ_BLOCK: {
|
||||||
// Initialized to silence warnings.
|
// Initialized to silence warnings.
|
||||||
|
@ -851,9 +850,9 @@ stream_encode_mt(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
// to be ready to be copied out.
|
// to be ready to be copied out.
|
||||||
coder->progress_out += lzma_index_size(coder->index)
|
coder->progress_out += lzma_index_size(coder->index)
|
||||||
+ LZMA_STREAM_HEADER_SIZE;
|
+ LZMA_STREAM_HEADER_SIZE;
|
||||||
}
|
|
||||||
|
|
||||||
// Fall through
|
FALLTHROUGH;
|
||||||
|
}
|
||||||
|
|
||||||
case SEQ_INDEX: {
|
case SEQ_INDEX: {
|
||||||
// Call the Index encoder. It doesn't take any input, so
|
// Call the Index encoder. It doesn't take any input, so
|
||||||
|
@ -873,10 +872,9 @@ stream_encode_mt(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
return LZMA_PROG_ERROR;
|
return LZMA_PROG_ERROR;
|
||||||
|
|
||||||
coder->sequence = SEQ_STREAM_FOOTER;
|
coder->sequence = SEQ_STREAM_FOOTER;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_STREAM_FOOTER:
|
case SEQ_STREAM_FOOTER:
|
||||||
lzma_bufcpy(coder->header, &coder->header_pos,
|
lzma_bufcpy(coder->header, &coder->header_pos,
|
||||||
sizeof(coder->header),
|
sizeof(coder->header),
|
||||||
|
|
|
@ -159,8 +159,7 @@ lzma2_encode(void *coder_ptr, lzma_mf *restrict mf,
|
||||||
coder->uncompressed_size = 0;
|
coder->uncompressed_size = 0;
|
||||||
coder->compressed_size = 0;
|
coder->compressed_size = 0;
|
||||||
coder->sequence = SEQ_LZMA_ENCODE;
|
coder->sequence = SEQ_LZMA_ENCODE;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_LZMA_ENCODE: {
|
case SEQ_LZMA_ENCODE: {
|
||||||
// Calculate how much more uncompressed data this chunk
|
// Calculate how much more uncompressed data this chunk
|
||||||
|
@ -219,10 +218,9 @@ lzma2_encode(void *coder_ptr, lzma_mf *restrict mf,
|
||||||
lzma2_header_lzma(coder);
|
lzma2_header_lzma(coder);
|
||||||
|
|
||||||
coder->sequence = SEQ_LZMA_COPY;
|
coder->sequence = SEQ_LZMA_COPY;
|
||||||
|
FALLTHROUGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_LZMA_COPY:
|
case SEQ_LZMA_COPY:
|
||||||
// Copy the compressed chunk along its headers to the
|
// Copy the compressed chunk along its headers to the
|
||||||
// output buffer.
|
// output buffer.
|
||||||
|
@ -244,8 +242,7 @@ lzma2_encode(void *coder_ptr, lzma_mf *restrict mf,
|
||||||
return LZMA_OK;
|
return LZMA_OK;
|
||||||
|
|
||||||
coder->sequence = SEQ_UNCOMPRESSED_COPY;
|
coder->sequence = SEQ_UNCOMPRESSED_COPY;
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case SEQ_UNCOMPRESSED_COPY:
|
case SEQ_UNCOMPRESSED_COPY:
|
||||||
// Copy the uncompressed data as is from the dictionary
|
// Copy the uncompressed data as is from the dictionary
|
||||||
|
|
|
@ -621,7 +621,7 @@ parse_real(args_info *args, int argc, char **argv)
|
||||||
case OPT_FILES:
|
case OPT_FILES:
|
||||||
args->files_delim = '\n';
|
args->files_delim = '\n';
|
||||||
|
|
||||||
// Fall through
|
FALLTHROUGH;
|
||||||
|
|
||||||
case OPT_FILES0:
|
case OPT_FILES0:
|
||||||
if (args->files_name != NULL)
|
if (args->files_name != NULL)
|
||||||
|
|
|
@ -525,8 +525,7 @@ parse_block_header(file_pair *pair, const lzma_index_iter *iter,
|
||||||
|
|
||||||
// If the above fails, the file is corrupt so
|
// If the above fails, the file is corrupt so
|
||||||
// LZMA_DATA_ERROR is a good error code.
|
// LZMA_DATA_ERROR is a good error code.
|
||||||
|
FALLTHROUGH;
|
||||||
// Fall through
|
|
||||||
|
|
||||||
case LZMA_DATA_ERROR:
|
case LZMA_DATA_ERROR:
|
||||||
// Free the memory allocated by lzma_block_header_decode().
|
// Free the memory allocated by lzma_block_header_decode().
|
||||||
|
|
Loading…
Reference in New Issue