cscvs to tla changeset 124

[onak.git] / keyindex.c

diff --git a/keyindex.c b/keyindex.c
index 464a7baaecd76d1eacbbb7726d2264851b265229..1f138517849800171d0022ef057d8dd5073f0013 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: keyindex.c,v 1.12 2003/06/08 21:11:01 noodles Exp $
+ * $Id: keyindex.c,v 1.14 2004/05/26 17:48:02 noodles Exp $
  */
 
 #include <assert.h>
@@ -72,10 +72,10 @@ int list_uids(struct openpgp_signedpacket_list *uids, bool verbose, bool html)
                        snprintf(buf, 1023, "%.*s",
                                (int) uids->packet->length,
                                uids->packet->data);
-                       printf("uid                             %s\n",
+                       printf("                                %s\n",
                                (html) ? txt2html(buf) : buf);
                } else if (uids->packet->tag == 17) {
-                       printf("uid                             "
+                       printf("                                "
                                "[photo id]\n");
                }
                if (verbose) {
@@ -248,7 +248,9 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                }
 
                list_uids(curuid, verbose, html);
-               list_subkeys(keys->subkeys, verbose, html);
+               if (verbose) {
+                       list_subkeys(keys->subkeys, verbose, html);
+               }
 
                keys = keys->next;
        }
@@ -294,7 +296,7 @@ int mrkey_index(struct openpgp_publickey *keys)
                                        keys->publickey->data[9];
                        break;
                case 4:
-                       get_fingerprint(keys->publickey, fp, &fplength);
+                       (void) get_fingerprint(keys->publickey, fp, &fplength);
 
                        for (i = 0; i < fplength; i++) {
                                printf("%02X", fp[i]);