diff options
| author | David Shaw <[email protected]> | 2004-03-25 22:43:51 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-03-25 22:43:51 +0000 |
| commit | 80c8b0c3a4fb810d65fd3f056dcfbbba2c3947ef (patch) | |
| tree | 8438cea6980b4828b982e2846a1790c3f52c199d | |
| parent | * keyedit.c (sign_uids, show_key_and_fingerprint, ask_revoke_sig, (diff) | |
| download | gnupg-80c8b0c3a4fb810d65fd3f056dcfbbba2c3947ef.tar.gz gnupg-80c8b0c3a4fb810d65fd3f056dcfbbba2c3947ef.zip | |
* options.h, g10.c (main), compress-bz2.c (init_uncompress): Rename
--bzip2-compress-lowmem to --bzip2-decompress-lowmem since it applies to
decompression, not compression.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/compress-bz2.c | 4 | ||||
| -rw-r--r-- | g10/g10.c | 10 | ||||
| -rw-r--r-- | g10/options.h | 2 |
4 files changed, 14 insertions, 8 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 85b819421..23bf16fc8 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2004-03-25 David Shaw <[email protected]> + + * options.h, g10.c (main), compress-bz2.c (init_uncompress): + Rename --bzip2-compress-lowmem to --bzip2-decompress-lowmem since + it applies to decompression, not compression. + 2004-03-24 David Shaw <[email protected]> * keyedit.c (sign_uids, show_key_and_fingerprint, ask_revoke_sig, diff --git a/g10/compress-bz2.c b/g10/compress-bz2.c index 73b382ed1..cebfa5388 100644 --- a/g10/compress-bz2.c +++ b/g10/compress-bz2.c @@ -1,5 +1,5 @@ /* compress.c - bzip2 compress filter - * Copyright (C) 2003 Free Software Foundation, Inc. + * Copyright (C) 2003, 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -101,7 +101,7 @@ init_uncompress( compress_filter_context_t *zfx, bz_stream *bzs ) { int rc; - if((rc=BZ2_bzDecompressInit(bzs,0,opt.bz2_compress_lowmem))!=BZ_OK) + if((rc=BZ2_bzDecompressInit(bzs,0,opt.bz2_decompress_lowmem))!=BZ_OK) log_fatal("bz2lib problem: %d\n",rc); zfx->inbufsize = 2048; @@ -196,7 +196,7 @@ enum cmd_and_opt_values oCompressAlgo, oCompressLevel, oBZ2CompressLevel, - oBZ2CompressLowmem, + oBZ2DecompressLowmem, oPasswdFD, #ifdef __riscos__ oPasswdFile, @@ -428,7 +428,7 @@ static ARGPARSE_OPTS opts[] = { { oCompress, NULL, 1, N_("|N|set compress level N (0 disables)") }, { oCompressLevel, "compress-level", 1, "@" }, { oBZ2CompressLevel, "bzip2-compress-level", 1, "@" }, - { oBZ2CompressLowmem, "bzip2-compress-lowmem", 0, "@" }, + { oBZ2DecompressLowmem, "bzip2-decompress-lowmem", 0, "@" }, { oTextmodeShort, NULL, 0, "@"}, { oTextmode, "textmode", 0, N_("use canonical text mode")}, { oNoTextmode, "no-textmode", 0, "@"}, @@ -511,8 +511,8 @@ static ARGPARSE_OPTS opts[] = { { oDigestAlgo, "digest-algo", 2, "@"}, { oCertDigestAlgo, "cert-digest-algo", 2 , "@" }, { oCompressAlgo,"compress-algo", 2, "@"}, - { oThrowKeyid, "throw-keyid", 0, "@"}, - { oNoThrowKeyid, "no-throw-keyid", 0, "@" }, + { oThrowKeyid, "throw-keyids", 0, "@"}, + { oNoThrowKeyid, "no-throw-keyids", 0, "@" }, { oShowPhotos, "show-photos", 0, "@" }, { oNoShowPhotos, "no-show-photos", 0, "@" }, { oPhotoViewer, "photo-viewer", 2, "@" }, @@ -2008,7 +2008,7 @@ main( int argc, char **argv ) break; case oCompressLevel: opt.compress_level = pargs.r.ret_int; break; case oBZ2CompressLevel: opt.bz2_compress_level = pargs.r.ret_int; break; - case oBZ2CompressLowmem: opt.bz2_compress_lowmem=1; break; + case oBZ2DecompressLowmem: opt.bz2_decompress_lowmem=1; break; case oPasswdFD: pwfd = iobuf_translate_file_handle (pargs.r.ret_int, 0); opt.use_agent = 0; diff --git a/g10/options.h b/g10/options.h index e948a1d53..1051d9ff0 100644 --- a/g10/options.h +++ b/g10/options.h @@ -73,7 +73,7 @@ struct int compress_algo; int compress_level; int bz2_compress_level; - int bz2_compress_lowmem; + int bz2_decompress_lowmem; const char *def_secret_key; char *def_recipient; int def_recipient_self; |