diff options
| -rw-r--r-- | g10/ChangeLog | 3 | ||||
| -rw-r--r-- | g10/compress-bz2.c | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 22884e2d8..5022cd8e5 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,8 @@ 2003-11-15 David Shaw <[email protected]> + * compress-bz2.c (init_compress): Compression level 0 is not + meaningful for bzip2. + * g10.c: Add --compress-level (same as -z). 2003-11-05 David Shaw <[email protected]> diff --git a/g10/compress-bz2.c b/g10/compress-bz2.c index a8497c154..1f2212878 100644 --- a/g10/compress-bz2.c +++ b/g10/compress-bz2.c @@ -30,10 +30,10 @@ #include "options.h" /* Note that the code in compress.c is nearly identical to the code - here, so if you fix a bug here, look there to see if the matching - bug needs to be fixed. I tried to have one set of functions that - could do ZIP, ZLIB, and BZIP2, but it became dangerously unreadable - with #ifdefs and if(algo) -dshaw */ + here, so if you fix a bug here, look there to see if a matching bug + needs to be fixed. I tried to have one set of functions that could + do ZIP, ZLIB, and BZIP2, but it became dangerously unreadable with + #ifdefs and if(algo) -dshaw */ static void init_compress( compress_filter_context_t *zfx, bz_stream *bzs ) @@ -41,12 +41,10 @@ init_compress( compress_filter_context_t *zfx, bz_stream *bzs ) int rc; int level; - if( opt.compress >= 0 && opt.compress <= 9 ) + if( opt.compress >= 1 && opt.compress <= 9 ) level = opt.compress; else if( opt.compress == -1 ) level = 6; /* no particular reason, but it seems reasonable */ - else if( opt.compress == 10 ) /* remove this ! */ - level = 0; else { log_error("invalid compression level; using default level\n"); |