1
0
Fork 0

Merging upstream version 1.15.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-17 22:33:22 +01:00
parent 85b7715347
commit 21ada3a77d
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
15 changed files with 47 additions and 45 deletions

View file

@ -1,5 +1,5 @@
/* Lunzip - Decompressor for the lzip format
Copyright (C) 2010-2024 Antonio Diaz Diaz.
Copyright (C) 2010-2025 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -204,9 +204,8 @@ static inline unsigned Rd_decode_tree8( Range_decoder * const rdec,
return symbol & 0xFF;
}
static inline unsigned
Rd_decode_tree_reversed( Range_decoder * const rdec,
Bit_model bm[], const int num_bits )
static inline unsigned Rd_decode_tree_reversed( Range_decoder * const rdec,
Bit_model bm[], const int num_bits )
{
unsigned model = 1;
unsigned symbol = 0;
@ -244,8 +243,7 @@ static inline unsigned Rd_decode_matched( Range_decoder * const rdec,
}
static inline unsigned Rd_decode_len( Range_decoder * const rdec,
Len_model * const lm,
const int pos_state )
Len_model * const lm, const int pos_state )
{
Bit_model * bm;
unsigned mask, offset, symbol = 1;
@ -386,8 +384,7 @@ static inline void LZd_free( LZ_decoder * const d )
static inline unsigned LZd_crc( const LZ_decoder * const d )
{ return d->crc ^ 0xFFFFFFFFU; }
static inline unsigned long long
LZd_data_position( const LZ_decoder * const d )
static inline unsigned long long LZd_data_position( const LZ_decoder * const d )
{ return d->partial_data_pos + d->pos; }
int LZd_decode_member( LZ_decoder * const d, Pretty_print * const pp );