1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00

* 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.
This commit is contained in:
David Shaw 2002-09-24 21:20:48 +00:00
parent c5faf2270a
commit 7ad7f453c0
4 changed files with 19 additions and 11 deletions

View file

@ -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;