summaryrefslogtreecommitdiff
path: root/ext/Compress-Raw-Bzip2
diff options
context:
space:
mode:
authorH.Merijn Brand <h.m.brand@xs4all.nl>2009-05-04 11:54:22 +0200
committerH.Merijn Brand <h.m.brand@xs4all.nl>2009-05-04 11:54:22 +0200
commit80b215cbddf12bec34cfa763645a8f8210afd962 (patch)
tree28be18ea57bf57d39abcf0d356a47bb2e7075851 /ext/Compress-Raw-Bzip2
parent7a9a6fa18cf50e7a69207bcbaba2f2bea016e33a (diff)
downloadperl-80b215cbddf12bec34cfa763645a8f8210afd962.tar.gz
Patch to fix the problem enclosed.
Subject: [PATCH] compress 2.019 ( was RE: [PATCH] compress 2.018) From: "Paul Marquess" <Paul.Marquess@ntlworld.com> Date: Mon, 4 May 2009 10:40:34 +0100 Message-ID: <011f01c9cc9c$610b6130$23222390$@Marquess@ntlworld.com>
Diffstat (limited to 'ext/Compress-Raw-Bzip2')
-rw-r--r--ext/Compress-Raw-Bzip2/Bzip2.xs19
-rw-r--r--ext/Compress-Raw-Bzip2/Changes4
-rw-r--r--ext/Compress-Raw-Bzip2/README8
-rw-r--r--ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm2
-rw-r--r--ext/Compress-Raw-Bzip2/t/000prereq.t2
5 files changed, 13 insertions, 22 deletions
diff --git a/ext/Compress-Raw-Bzip2/Bzip2.xs b/ext/Compress-Raw-Bzip2/Bzip2.xs
index f66e2efa94..36b2dbe32d 100644
--- a/ext/Compress-Raw-Bzip2/Bzip2.xs
+++ b/ext/Compress-Raw-Bzip2/Bzip2.xs
@@ -757,7 +757,7 @@ bzinflate (s, buf, output)
if((s->flags & FLAG_APPEND_OUTPUT) != FLAG_APPEND_OUTPUT) {
SvCUR_set(output, 0);
}
-#if 1
+
/* Assume no output buffer - the code below will update if there is any available */
s->stream.avail_out = 0;
@@ -783,19 +783,6 @@ bzinflate (s, buf, output)
s->bytesInflated = 0;
RETVAL = BZ_OK;
-#else
-
- if (SvLEN(output)) {
- prefix_length = cur_length = SvCUR(output) ;
- s->stream.next_out = (char*) SvPVbyte_nolen(output) + cur_length;
- increment = SvLEN(output) - cur_length - 1;
- s->stream.avail_out = increment;
- }
- else {
- s->stream.avail_out = 0;
- }
- s->bytesInflated = 0;
-#endif
while (1) {
@@ -809,10 +796,10 @@ bzinflate (s, buf, output)
bufinc *= 2 ;
}
- //DispStream(s, "pre");
+ /*DispStream(s, "pre"); */
RETVAL = BZ2_bzDecompress (&(s->stream));
- //DispStream(s, "apres");
+ /*DispStream(s, "apres");*/
if (RETVAL != BZ_OK || s->flags & FLAG_LIMIT_OUTPUT)
break ;
diff --git a/ext/Compress-Raw-Bzip2/Changes b/ext/Compress-Raw-Bzip2/Changes
index d9ff756d32..f8c7a64bc8 100644
--- a/ext/Compress-Raw-Bzip2/Changes
+++ b/ext/Compress-Raw-Bzip2/Changes
@@ -1,6 +1,10 @@
CHANGES
-------
+ 2.019 4 May 2009
+
+ * tidied up Bzip2.xs
+
2.018 3 May 2009
* added linitOutput option
diff --git a/ext/Compress-Raw-Bzip2/README b/ext/Compress-Raw-Bzip2/README
index c80d6da8fc..7f6bcb72e3 100644
--- a/ext/Compress-Raw-Bzip2/README
+++ b/ext/Compress-Raw-Bzip2/README
@@ -1,9 +1,9 @@
- Compress-Raw-Bzip2
+ Compress-Raw-Bzip2
- Version 2.018
+ Version 2.019
- 3rd May 2009
+ 4th May 2009
Copyright (c) 2005-2009 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it
@@ -164,7 +164,7 @@ To help me help you, I need all of the following information:
If you haven't installed Compress-Raw-Bzip2 then search Compress::Raw::Bzip2.pm
for a line like this:
- $VERSION = "2.018" ;
+ $VERSION = "2.019" ;
c. The version of bzip2 you have used.
If you have successfully installed Compress-Raw-Bzip2, this one-liner
diff --git a/ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm b/ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
index e0eda15619..0c5d8bc9ba 100644
--- a/ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
+++ b/ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
@@ -12,7 +12,7 @@ use Carp ;
use bytes ;
our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
-$VERSION = '2.018';
+$VERSION = '2.019';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
diff --git a/ext/Compress-Raw-Bzip2/t/000prereq.t b/ext/Compress-Raw-Bzip2/t/000prereq.t
index 0bbf31226f..fd131fc7e6 100644
--- a/ext/Compress-Raw-Bzip2/t/000prereq.t
+++ b/ext/Compress-Raw-Bzip2/t/000prereq.t
@@ -19,7 +19,7 @@ BEGIN
if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 };
- my $VERSION = '2.018';
+ my $VERSION = '2.019';
my @NAMES = qw(
);