Skip to content

Commit 1bff267

Browse files
bingosbingos
committed
Update Compress-Raw-Bzip2 to CPAN version 2.089
 [Delta] 2.089 3 November 2019 * No Changes 2.088 31 October 2019 * Add Support Details 37e04fb3dc50287a3512b004282425c6eedb8af6 * upgrade to Bzip2 1.0.8 027a30848ee57731b435d2ea7af09e532bf6fbfd
1 parent 30bda22 commit 1bff267

File tree

13 files changed

+48
-48
lines changed

13 files changed

+48
-48
lines changed

‎Porting/Maintainers.pl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ package Maintainers;
207207
},
208208

209209
'Compress::Raw::Bzip2' => {
210-
'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.087.tar.gz',
210+
'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.089.tar.gz',
211211
'FILES' => q[cpan/Compress-Raw-Bzip2],
212212
'EXCLUDED' => [
213213
qr{^t/Test/},

‎cpan/Compress-Raw-Bzip2/bzip2-src/LICENSE‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
--------------------------------------------------------------------------
33

44
This program, "bzip2", the associated library "libbzip2", and all
5-
documentation, are copyright (C) 1996-2010 Julian R Seward. All
5+
documentation, are copyright (C) 1996-2019 Julian R Seward. All
66
rights reserved.
77

88
Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
3636
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
3737
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3838

39-
Julian Seward, jseward@bzip.org
40-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
39+
Julian Seward, jseward@acm.org
40+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
4141

4242
--------------------------------------------------------------------------

‎cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
This file is part of bzip2/libbzip2, a program and library for
99
lossless, block-sorting data compression.
1010
11-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
12-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
11+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
12+
Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
1313
1414
Please read the WARNING, DISCLAIMER and PATENTS sections in the
1515
README file.
@@ -202,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap,
202202
bhtab [ 0 .. 2+(nblock/32) ] destroyed
203203
*/
204204

205-
#define SET_BH(zz) bhtab[(zz) >> 5] |= (1U << ((zz) & 31))
206-
#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1U << ((zz) & 31))
207-
#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1U << ((zz) & 31)))
205+
#define SET_BH(zz) bhtab[(zz) >> 5] |= ((UInt32)1 << ((zz) & 31))
206+
#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~((UInt32)1 << ((zz) & 31))
207+
#define ISSET_BH(zz) (bhtab[(zz) >> 5] & ((UInt32)1 << ((zz) & 31)))
208208
#define WORD_BH(zz) bhtab[(zz) >> 5]
209209
#define UNALIGNED_BH(zz) ((zz) & 0x01f)
210210

@@ -477,7 +477,7 @@ Bool mainGtU ( UInt32 i1,
477477
usually small, typically <= 20.
478478
--*/
479479
static
480-
const Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280,
480+
Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280,
481481
9841, 29524, 88573, 265720,
482482
797161, 2391484 };
483483

‎cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.c‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
This file is part of bzip2/libbzip2, a program and library for
99
lossless, block-sorting data compression.
1010
11-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
12-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
11+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
12+
Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
1313
1414
Please read the WARNING, DISCLAIMER and PATENTS sections in the
1515
README file.
@@ -43,12 +43,12 @@ void BZ2_bz__AssertH__fail ( int errcode )
4343
fprintf(stderr,
4444
"\n\nbzip2/libbzip2: internal error number %d.\n"
4545
"This is a bug in bzip2/libbzip2, %s.\n"
46-
"Please report it to me at: jseward@bzip.org. If this happened\n"
46+
"Please report it to: bzip2-devel@sourceware.org. If this happened\n"
4747
"when you were using some program which uses libbzip2 as a\n"
4848
"component, you should also report this bug to the author(s)\n"
4949
"of that program. Please make an effort to report this bug;\n"
5050
"timely and accurate bug reports eventually lead to higher\n"
51-
"quality software. Thanks. Julian Seward, 10 December 2007.\n\n",
51+
"quality software. Thanks.\n\n",
5252
errcode,
5353
BZ2_bzlibVersion()
5454
);
@@ -98,29 +98,19 @@ int bz_config_ok ( void )
9898

9999

100100
/*---------------------------------------------------*/
101-
#ifdef __cplusplus
102-
extern "C"
103-
{
104-
#endif
105-
106101
static
107102
void* default_bzalloc ( void* opaque, Int32 items, Int32 size )
108103
{
109104
void* v = malloc ( items * size );
110-
(void)opaque;
111105
return v;
112106
}
113107

114108
static
115109
void default_bzfree ( void* opaque, void* addr )
116110
{
117-
(void)opaque;
118111
if (addr != NULL) free ( addr );
119112
}
120113

121-
#ifdef __cplusplus
122-
}
123-
#endif
124114

125115
/*---------------------------------------------------*/
126116
static

‎cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
This file is part of bzip2/libbzip2, a program and library for
99
lossless, block-sorting data compression.
1010
11-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
12-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
11+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
12+
Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
1313
1414
Please read the WARNING, DISCLAIMER and PATENTS sections in the
1515
README file.

‎cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
This file is part of bzip2/libbzip2, a program and library for
99
lossless, block-sorting data compression.
1010
11-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
12-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
11+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
12+
Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
1313
1414
Please read the WARNING, DISCLAIMER and PATENTS sections in the
1515
README file.
@@ -36,7 +36,7 @@
3636

3737
/*-- General stuff. --*/
3838

39-
#define BZ_VERSION "1.0.6, 6-Sept-2010"
39+
#define BZ_VERSION "1.0.8, 13-Jul-2019"
4040

4141
typedef char Char;
4242
typedef unsigned char Bool;

‎cpan/Compress-Raw-Bzip2/bzip2-src/compress.c‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
This file is part of bzip2/libbzip2, a program and library for
99
lossless, block-sorting data compression.
1010
11-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
12-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
11+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
12+
Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
1313
1414
Please read the WARNING, DISCLAIMER and PATENTS sections in the
1515
README file.
@@ -353,7 +353,7 @@ void sendMTFValues ( EState* s )
353353
Calculate the cost of this group as coded
354354
by each of the coding tables.
355355
--*/
356-
for (t = 0; t < BZ_N_GROUPS; t++) cost[t] = 0;
356+
for (t = 0; t < nGroups; t++) cost[t] = 0;
357357

358358
if (nGroups == 6 && 50 == ge-gs+1) {
359359
/*--- fast track the common case ---*/
@@ -454,7 +454,7 @@ void sendMTFValues ( EState* s )
454454

455455
AssertH( nGroups < 8, 3002 );
456456
AssertH( nSelectors < 32768 &&
457-
nSelectors <= (2 + (900000 / BZ_G_SIZE)),
457+
nSelectors <= BZ_MAX_SELECTORS,
458458
3003 );
459459

460460

@@ -593,8 +593,6 @@ void sendMTFValues ( EState* s )
593593
}
594594
AssertH( selCtr == nSelectors, 3007 );
595595

596-
(void)nBytes; /* only set, not used */
597-
598596
if (s->verbosity >= 3)
599597
VPrintf1( "codes %d\n", s->numZ-nBytes );
600598
}

‎cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
This file is part of bzip2/libbzip2, a program and library for
99
lossless, block-sorting data compression.
1010
11-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
12-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
11+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
12+
Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
1313
1414
Please read the WARNING, DISCLAIMER and PATENTS sections in the
1515
README file.

‎cpan/Compress-Raw-Bzip2/bzip2-src/decompress.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
This file is part of bzip2/libbzip2, a program and library for
99
lossless, block-sorting data compression.
1010
11-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
12-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
11+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
12+
Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
1313
1414
Please read the WARNING, DISCLAIMER and PATENTS sections in the
1515
README file.
@@ -285,7 +285,7 @@ Int32 BZ2_decompress ( DState* s )
285285

286286
/*--- Now the selectors ---*/
287287
GET_BITS(BZ_X_SELECTOR_1, nGroups, 3);
288-
if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
288+
if (nGroups < 2 || nGroups > BZ_N_GROUPS) RETURN(BZ_DATA_ERROR);
289289
GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
290290
if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
291291
for (i = 0; i < nSelectors; i++) {
@@ -296,8 +296,14 @@ Int32 BZ2_decompress ( DState* s )
296296
j++;
297297
if (j >= nGroups) RETURN(BZ_DATA_ERROR);
298298
}
299-
s->selectorMtf[i] = j;
299+
/* Having more than BZ_MAX_SELECTORS doesn't make much sense
300+
since they will never be used, but some implementations might
301+
"round up" the number of selectors, so just ignore those. */
302+
if (i < BZ_MAX_SELECTORS)
303+
s->selectorMtf[i] = j;
300304
}
305+
if (nSelectors > BZ_MAX_SELECTORS)
306+
nSelectors = BZ_MAX_SELECTORS;
301307

302308
/*--- Undo the MTF values for the selectors. ---*/
303309
{

‎cpan/Compress-Raw-Bzip2/bzip2-src/huffman.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
This file is part of bzip2/libbzip2, a program and library for
99
lossless, block-sorting data compression.
1010
11-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
12-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
11+
bzip2/libbzip2 version 1.0.8 of 13 July 2019
12+
Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
1313
1414
Please read the WARNING, DISCLAIMER and PATENTS sections in the
1515
README file.

0 commit comments

Comments
 (0)