diff options
| author | Werner Koch <[email protected]> | 2001-12-22 13:12:24 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2001-12-22 13:12:24 +0000 |
| commit | ccb1f8c175f5f1b52d07a8f38033b50d77df1280 (patch) | |
| tree | cf9efd813911263355f9bead04e7857030165419 | |
| parent | * keyserver.c (keyserver_spawn): Removed some variables (diff) | |
| download | gnupg-ccb1f8c175f5f1b52d07a8f38033b50d77df1280.tar.gz gnupg-ccb1f8c175f5f1b52d07a8f38033b50d77df1280.zip | |
Minor cleanups
| -rw-r--r-- | g10/ChangeLog | 8 | ||||
| -rw-r--r-- | g10/encode.c | 31 | ||||
| -rw-r--r-- | include/ChangeLog | 2 | ||||
| -rw-r--r-- | util/ChangeLog | 2 | ||||
| -rw-r--r-- | util/fileutil.c | 3 |
5 files changed, 28 insertions, 18 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 1d7174397..890ad3731 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,6 +1,10 @@ -2001-12-22 Timo Schulz <[email protected]> +2001-12-22 Werner Koch <[email protected]> + + * encode.c (encode_simple, encode_crypt): i18n 2 strings. - * encode.c (encode_simple, encode_crypt): Use is_file_compressed +2001-12-22 Timo Schulz <[email protected]> + + * encode.c (encode_simple, encode_crypt): Use is_file_compressed to avoid to compress compressed files. 2001-12-22 Werner Koch <[email protected]> diff --git a/g10/encode.c b/g10/encode.c index 7450e7344..901d0acae 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -86,11 +86,12 @@ encode_simple( const char *filename, int mode ) memset( &tfx, 0, sizeof tfx); init_packet(&pkt); - if (is_file_compressed(filename, &rc)) { - if (opt.verbose) - log_info("`%s' already compressed\n", filename); - do_compress = 0; - } + if (is_file_compressed(filename, &rc)) + { + if (opt.verbose) + log_info(_("`%s' already compressed\n"), filename); + do_compress = 0; + } if (rc) return rc; @@ -284,15 +285,17 @@ encode_crypt( const char *filename, STRLIST remusr ) } } - if (is_file_compressed(filename, &rc2)) { - if (opt.verbose) - log_info("`%s' already compressed\n", filename); - do_compress = 0; - } - if (rc2) { - rc = rc2; - goto leave; - } + if (is_file_compressed(filename, &rc2)) + { + if (opt.verbose) + log_info(_("`%s' already compressed\n"), filename); + do_compress = 0; + } + if (rc2) + { + rc = rc2; + goto leave; + } /* prepare iobufs */ if( !(inp = iobuf_open(filename)) ) { diff --git a/include/ChangeLog b/include/ChangeLog index 536be77d0..4d52221b9 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,6 +1,6 @@ 2001-12-22 Timo Schulz <[email protected]> - * util.h: Add is_file_compressed(). + * util.h (is_file_compressed): New. 2001-12-19 Werner Koch <[email protected]> diff --git a/util/ChangeLog b/util/ChangeLog index 91e503803..6572bbacd 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,6 +1,6 @@ 2001-12-22 Timo Schulz <[email protected]> - * fileutil.c (is_file_compressed): New. + * fileutil.c (is_file_compressed): New. 2001-12-19 Werner Koch <[email protected]> diff --git a/util/fileutil.c b/util/fileutil.c index e0c0d1982..874043076 100644 --- a/util/fileutil.c +++ b/util/fileutil.c @@ -227,3 +227,6 @@ leave: iobuf_close(a); return rc; } + + + |