summaryrefslogtreecommitdiffstats
path: root/decoder.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-01-23 14:39:08 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-01-23 14:39:17 +0000
commit18cc9814761e1b87c81168fd495f54d27176bf71 (patch)
treeaa2fbba67797c895a4d00c0dd9848abf8aa78dc4 /decoder.c
parentReleasing debian version 1.13-6. (diff)
downloadlzlib-18cc9814761e1b87c81168fd495f54d27176bf71.tar.xz
lzlib-18cc9814761e1b87c81168fd495f54d27176bf71.zip
Merging upstream version 1.14.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'decoder.c')
-rw-r--r--decoder.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/decoder.c b/decoder.c
index 16f6532..6544ec6 100644
--- a/decoder.c
+++ b/decoder.c
@@ -1,5 +1,5 @@
/* Lzlib - Compression library for the lzip format
- Copyright (C) 2009-2022 Antonio Diaz Diaz.
+ Copyright (C) 2009-2024 Antonio Diaz Diaz.
This library is free software. Redistribution and use in source and
binary forms, with or without modification, are permitted provided
@@ -17,12 +17,12 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-static int LZd_try_verify_trailer( struct LZ_decoder * const d )
+static int LZd_try_check_trailer( struct LZ_decoder * const d )
{
Lzip_trailer trailer;
if( Rd_available_bytes( d->rdec ) < Lt_size )
{ if( !d->rdec->at_stream_end ) return 0; else return 2; }
- d->verify_trailer_pending = false;
+ d->check_trailer_pending = false;
d->member_finished = true;
if( Rd_read_data( d->rdec, trailer, Lt_size ) == Lt_size &&
@@ -45,7 +45,7 @@ static int LZd_decode_member( struct LZ_decoder * const d )
if( d->member_finished ) return 0;
if( !Rd_try_reload( rdec ) )
{ if( !rdec->at_stream_end ) return 0; else return 2; }
- if( d->verify_trailer_pending ) return LZd_try_verify_trailer( d );
+ if( d->check_trailer_pending ) return LZd_try_check_trailer( d );
while( !Rd_finished( rdec ) )
{
@@ -121,14 +121,14 @@ static int LZd_decode_member( struct LZ_decoder * const d )
old_mpos = mpos; */
if( len == min_match_len ) /* End Of Stream marker */
{
- d->verify_trailer_pending = true;
- return LZd_try_verify_trailer( d );
+ d->check_trailer_pending = true;
+ return LZd_try_check_trailer( d );
}
if( len == min_match_len + 1 ) /* Sync Flush marker */
{
rdec->reload_pending = true;
if( Rd_try_reload( rdec ) ) continue;
- else { if( !rdec->at_stream_end ) return 0; else break; }
+ if( !rdec->at_stream_end ) return 0; else break;
}
return 4;
}