Update Compress-Raw-Bzip2 to CPAN version 2.069

  [DELTA]

  2.069 26 Sept 2015

      * reduce compiler warnings and stderr noise
        [#101340]

      * consting misc tables
        [#101296]

7 files changed, 14 insertions, 27 deletions

diff --git a/cpan/Compress-Raw-Bzip2/Bzip2.xs b/cpan/Compress-Raw-Bzip2/Bzip2.xs
index 17924c7898..e47dbae853 100644
--- a/cpan/Compress-Raw-Bzip2/Bzip2.xs
+++ b/cpan/Compress-Raw-Bzip2/Bzip2.xs
@@ -101,9 +101,10 @@ static const char my_z_errmsg[][32] = {
 # define NO_WRITEABLE_DATA
 #endif
 
+/* Set TRACE_DEFAULT to a non-zero value to enable tracing */
 #define TRACE_DEFAULT 0
 
-#ifdef NO_WRITEABLE_DATA
+#if defined(NO_WRITEABLE_DATA) || TRACE_DEFAULT == 0
 #  define trace TRACE_DEFAULT
 #else
   static int trace = TRACE_DEFAULT ;
@@ -133,18 +134,7 @@ GetErrorString(error_no)
 int error_no ;
 #endif
 {
-    dTHX;
-    char * errstr ;
-  
-#if 0
-    if (error_no == BZ_ERRNO) {
-        errstr = Strerror(errno) ;
-    }
-    else
-#endif
-        errstr = (char*) my_z_errmsg[4 - error_no]; 
-
-    return errstr ;
+    return(char*) my_z_errmsg[4 - error_no]; 
 }
 
 static void
@@ -344,9 +334,6 @@ PROTOTYPES:	DISABLE
 INCLUDE: constants.xs
 
 BOOT:
-#ifndef NO_WRITEABLE_DATA
-  trace = TRACE_DEFAULT ;
-#endif
     /* Check this version of bzip2 is == 1 */
     if (BZ2_bzlibVersion()[0] != '1')
 	croak(COMPRESS_CLASS " needs bzip2 version 1.x, you have %s\n", BZ2_bzlibVersion()) ;
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c b/cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c
index d0d662cd4e..605b665883 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c
@@ -202,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap,
       bhtab [ 0 .. 2+(nblock/32) ] destroyed
 */
 
-#define       SET_BH(zz)  bhtab[(zz) >> 5] |= (1 << ((zz) & 31))
-#define     CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31))
-#define     ISSET_BH(zz)  (bhtab[(zz) >> 5] & (1 << ((zz) & 31)))
+#define       SET_BH(zz)  bhtab[(zz) >> 5] |= (1U << ((zz) & 31))
+#define     CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~(1U << ((zz) & 31))
+#define     ISSET_BH(zz)  (bhtab[(zz) >> 5] & (1U << ((zz) & 31)))
 #define      WORD_BH(zz)  bhtab[(zz) >> 5]
 #define UNALIGNED_BH(zz)  ((zz) & 0x01f)
 
@@ -477,7 +477,7 @@ Bool mainGtU ( UInt32  i1,
    usually small, typically <= 20.
 --*/
 static
-Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280,
+const Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280,
                    9841, 29524, 88573, 265720,
                    797161, 2391484 };
 
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h
index 5d0217f463..a18585db82 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h
@@ -128,7 +128,7 @@ extern void bz_internal_error ( int errcode );
 
 /*-- Stuff for randomising repetitive blocks. --*/
 
-extern Int32 BZ2_rNums[512];
+extern const Int32 BZ2_rNums[512];
 
 #define BZ_RAND_DECLS                          \
    Int32 rNToGo;                               \
@@ -152,7 +152,7 @@ extern Int32 BZ2_rNums[512];
 
 /*-- Stuff for doing CRCs. --*/
 
-extern UInt32 BZ2_crc32Table[256];
+extern const UInt32 BZ2_crc32Table[256];
 
 #define BZ_INITIALISE_CRC(crcVar)              \
 {                                              \
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c b/cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c
index 1fea7e946c..9616312d7d 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c
@@ -28,7 +28,7 @@
   comp.compression FAQ.
 --*/
 
-UInt32 BZ2_crc32Table[256] = {
+const UInt32 BZ2_crc32Table[256] = {
 
    /*-- Ugly, innit? --*/
 
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/randtable.c b/cpan/Compress-Raw-Bzip2/bzip2-src/randtable.c
index 6d62459906..4a2fd189b0 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/randtable.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/randtable.c
@@ -23,7 +23,7 @@
 
 
 /*---------------------------------------------*/
-Int32 BZ2_rNums[512] = { 
+const Int32 BZ2_rNums[512] = { 
    619, 720, 127, 481, 931, 816, 813, 233, 566, 247, 
    985, 724, 205, 454, 863, 491, 741, 242, 949, 214, 
    733, 859, 335, 708, 621, 574, 73, 654, 730, 472, 
diff --git a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
index a5cdc2f562..d9e25bde1f 100644
--- a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
+++ b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
@@ -11,7 +11,7 @@ use Carp ;
 use bytes ;
 our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
 
-$VERSION = '2.068';
+$VERSION = '2.069';
 $XS_VERSION = $VERSION; 
 $VERSION = eval $VERSION;
 
@@ -378,7 +378,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/cpan/Compress-Raw-Bzip2/t/000prereq.t b/cpan/Compress-Raw-Bzip2/t/000prereq.t
index e63b595cba..ebe0f50efb 100644
--- a/cpan/Compress-Raw-Bzip2/t/000prereq.t
+++ b/cpan/Compress-Raw-Bzip2/t/000prereq.t
@@ -19,7 +19,7 @@ BEGIN
         if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
 
 
-    my $VERSION = '2.068';
+    my $VERSION = '2.069';
     my @NAMES = qw(
 			
 			);