* import.c (import_keys_stream): Fix compiler type warning.
authorDavid Shaw <dshaw@jabberwocky.com>
Tue, 24 Sep 2002 21:20:48 +0000 (21:20 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Tue, 24 Sep 2002 21:20:48 +0000 (21:20 +0000)
* keyring.c (keyring_rebuild_cache), sig-check.c (check_key_signature2),
import.c (import, chk_self_sigs): Minor language cleanups.

g10/ChangeLog
g10/import.c
g10/keyring.c
g10/sig-check.c

index b7e5fb1..cf3442f 100644 (file)
@@ -1,3 +1,11 @@
+2002-09-24  David Shaw  <dshaw@jabberwocky.com>
+
+       * 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.
+
 2002-09-23  Stefan Bellon  <sbellon@sbellon.de>
 
        * main.h: Introduced fast-import as import option. Removed
index dd8ab0e..269bb93 100644 (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;
index b084aa8..3160b1c 100644 (file)
@@ -1374,7 +1374,7 @@ keyring_rebuild_cache (void *token)
         goto leave;
 
       if ( !(++count % 50) && !opt.quiet)
-        log_info(_("%lu keys so far checked (%lu signatures)\n"),
+        log_info(_("%lu keys checked so far (%lu signatures)\n"),
                  count, sigcount );
 
     } /* end main loop */ 
index e4e3b76..afcce27 100644 (file)
@@ -547,7 +547,7 @@ check_key_signature2( KBNODE root, KBNODE node, int *is_selfsig,
        else {
             if (!opt.quiet)
                 log_info (_("key %08lX: no subkey for subkey "
-                           "revocation packet\n"),
+                           "revocation signature\n"),
                           (ulong)keyid_from_pk (pk, NULL));
            rc = G10ERR_SIG_CLASS;
        }
@@ -572,8 +572,8 @@ check_key_signature2( KBNODE root, KBNODE node, int *is_selfsig,
        }
        else {
             if (!opt.quiet)
-                log_info ("key %08lX: no subkey for subkey binding packet\n",
-                          (ulong)keyid_from_pk (pk, NULL));
+                log_info ("key %08lX: no subkey for subkey "
+                         "binding signature\n",(ulong)keyid_from_pk(pk,NULL));
            rc = G10ERR_SIG_CLASS;
        }
     }