security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-11 21:48:50 +01:00
Code Activity

* options.h, g10.c (main), compress-bz2.c (init_uncompress): Rename

Browse Source 
--bzip2-compress-lowmem to --bzip2-decompress-lowmem since it applies to
decompression, not compression.
This commit is contained in:
David Shaw 2004-03-25 22:43:51 +00:00
parent 618779fec2
commit 80c8b0c3a4
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2004-03-25 David Shaw <dshaw@jabberwocky.com>
* 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 <dshaw@jabberwocky.com> 2004-03-24 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (sign_uids, show_key_and_fingerprint, ask_revoke_sig, * keyedit.c (sign_uids, show_key_and_fingerprint, ask_revoke_sig,

4
g10/compress-bz2.c
View File

@ -1,5 +1,5 @@
/* compress.c - bzip2 compress filter /* 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. * This file is part of GnuPG.
* *
@ -101,7 +101,7 @@ init_uncompress( compress_filter_context_t *zfx, bz_stream *bzs )
{ {
int rc; 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); log_fatal("bz2lib problem: %d\n",rc);
zfx->inbufsize = 2048; zfx->inbufsize = 2048;

10
g10/g10.c
View File

@ -196,7 +196,7 @@ enum cmd_and_opt_values
oCompressAlgo, oCompressAlgo,
oCompressLevel, oCompressLevel,
oBZ2CompressLevel, oBZ2CompressLevel,
oBZ2CompressLowmem, oBZ2DecompressLowmem,
oPasswdFD, oPasswdFD,
#ifdef __riscos__ #ifdef __riscos__
oPasswdFile, oPasswdFile,
@ -428,7 +428,7 @@ static ARGPARSE_OPTS opts[] = {
{ oCompress, NULL, 1, N_("|N|set compress level N (0 disables)") }, { oCompress, NULL, 1, N_("|N|set compress level N (0 disables)") },
{ oCompressLevel, "compress-level", 1, "@" }, { oCompressLevel, "compress-level", 1, "@" },
{ oBZ2CompressLevel, "bzip2-compress-level", 1, "@" }, { oBZ2CompressLevel, "bzip2-compress-level", 1, "@" },
{ oBZ2CompressLowmem, "bzip2-compress-lowmem", 0, "@" }, { oBZ2DecompressLowmem, "bzip2-decompress-lowmem", 0, "@" },
{ oTextmodeShort, NULL, 0, "@"}, { oTextmodeShort, NULL, 0, "@"},
{ oTextmode, "textmode", 0, N_("use canonical text mode")}, { oTextmode, "textmode", 0, N_("use canonical text mode")},
{ oNoTextmode, "no-textmode", 0, "@"}, { oNoTextmode, "no-textmode", 0, "@"},
@ -511,8 +511,8 @@ static ARGPARSE_OPTS opts[] = {
{ oDigestAlgo, "digest-algo", 2, "@"}, { oDigestAlgo, "digest-algo", 2, "@"},
{ oCertDigestAlgo, "cert-digest-algo", 2 , "@" }, { oCertDigestAlgo, "cert-digest-algo", 2 , "@" },
{ oCompressAlgo,"compress-algo", 2, "@"}, { oCompressAlgo,"compress-algo", 2, "@"},
{ oThrowKeyid, "throw-keyid", 0, "@"}, { oThrowKeyid, "throw-keyids", 0, "@"},
{ oNoThrowKeyid, "no-throw-keyid", 0, "@" }, { oNoThrowKeyid, "no-throw-keyids", 0, "@" },
{ oShowPhotos, "show-photos", 0, "@" }, { oShowPhotos, "show-photos", 0, "@" },
{ oNoShowPhotos, "no-show-photos", 0, "@" }, { oNoShowPhotos, "no-show-photos", 0, "@" },
{ oPhotoViewer, "photo-viewer", 2, "@" }, { oPhotoViewer, "photo-viewer", 2, "@" },
@ -2008,7 +2008,7 @@ main( int argc, char **argv )
break; break;
case oCompressLevel: opt.compress_level = pargs.r.ret_int; break; case oCompressLevel: opt.compress_level = pargs.r.ret_int; break;
case oBZ2CompressLevel: opt.bz2_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: case oPasswdFD:
pwfd = iobuf_translate_file_handle (pargs.r.ret_int, 0); pwfd = iobuf_translate_file_handle (pargs.r.ret_int, 0);
opt.use_agent = 0; opt.use_agent = 0;

2
g10/options.h
View File

@ -73,7 +73,7 @@ struct
int compress_algo; int compress_algo;
int compress_level; int compress_level;
int bz2_compress_level; int bz2_compress_level;
int bz2_compress_lowmem; int bz2_decompress_lowmem;
const char *def_secret_key; const char *def_secret_key;
char *def_recipient; char *def_recipient;
int def_recipient_self; int def_recipient_self;