diff options
| author | David Shaw <[email protected]> | 2002-09-24 21:20:48 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-09-24 21:20:48 +0000 |
| commit | 7ad7f453c0e93133d5f958f9906d58db535b59c2 (patch) | |
| tree | f56498a33e60b5a4f53faafd0bf47e6ec55e0048 /g10/import.c | |
| parent | * http.c (connect_server): Try all A records for names with multiple (diff) | |
| download | gnupg-7ad7f453c0e93133d5f958f9906d58db535b59c2.tar.gz gnupg-7ad7f453c0e93133d5f958f9906d58db535b59c2.zip | |
* import.c (import_keys_stream): Fix compiler type warning.
* keyring.c (keyring_rebuild_cache), sig-check.c (check_key_signature2),
import.c (import, chk_self_sigs): Minor language cleanups.
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/g10/import.c b/g10/import.c index dd8ab0e8f..269bb93c0 100644 --- a/g10/import.c +++ b/g10/import.c @@ -238,7 +238,7 @@ import_keys( char **fnames, int nnames, int import_keys_stream( IOBUF inp, void *stats_handle, unsigned int options ) { - return import_keys_internal( inp, NULL, NULL, stats_handle, options); + return import_keys_internal( inp, NULL, 0, stats_handle, options); } static int @@ -276,7 +276,7 @@ import( IOBUF inp, const char* fname, if( rc ) break; if( !(++stats->count % 100) && !opt.quiet ) - log_info(_("%lu keys so far processed\n"), stats->count ); + log_info(_("%lu keys processed so far\n"), stats->count ); } if( rc == -1 ) rc = 0; @@ -1055,8 +1055,8 @@ chk_self_sigs( const char *fname, KBNODE keyblock, revocation targets, this may need to be revised. */ if( !knode ) { - log_info( _("key %08lX: no subkey for key binding\n"), - (ulong)keyid[1]); + log_info( _("key %08lX: no subkey for subkey " + "binding signature\n"),(ulong)keyid[1]); n->flag |= 4; /* delete this */ } else { @@ -1096,8 +1096,8 @@ chk_self_sigs( const char *fname, KBNODE keyblock, See the comment in getkey.c:merge_selfsigs_subkey for more */ if( !knode ) { - log_info( _("key %08lX: no subkey for key revocation\n"), - (ulong)keyid[1]); + log_info( _("key %08lX: no subkey for subkey " + "revocation signature\n"),(ulong)keyid[1]); n->flag |= 4; /* delete this */ } else { @@ -1117,7 +1117,7 @@ chk_self_sigs( const char *fname, KBNODE keyblock, sig since this one is newer */ log_info(_("key %08lX: removed multiple subkey " - "revocation\n"),(ulong)keyid[1]); + "revocation signatures\n"),(ulong)keyid[1]); } rsnode=n; |