diff options
author | Werner Koch <[email protected]> | 2014-03-27 11:59:55 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2014-03-27 11:59:55 +0000 |
commit | 4f50ec98ddd57253cae66e2321f0cc98ee189a09 (patch) | |
tree | feb4dc9662cfd4a2833cfdcb8587d47939b49fd4 /g10/mainproc.c | |
parent | agent: Replace es_mopen by es_fopenmem for ssh. (diff) | |
download | gnupg-4f50ec98ddd57253cae66e2321f0cc98ee189a09.tar.gz gnupg-4f50ec98ddd57253cae66e2321f0cc98ee189a09.zip |
Change some keyedit functions to allow printing to arbitrary streams.
* common/ttyio.c (tty_print_string): Add optional arg FP. Change all
callers.
(tty_print_utf8_string2): Ditto.
* g10/keyedit.c (show_prefs): Ditto.
(show_key_with_all_names_colon): Ditto.
(show_names): Ditto.
* g10/keylist.c (print_revokers): Ditto.
(print_fingerprint): Ditto.
Diffstat (limited to 'g10/mainproc.c')
-rw-r--r-- | g10/mainproc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index 6bd475ba3..f830eeedb 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -953,7 +953,7 @@ list_node( CTX c, KBNODE node ) if( node->next && node->next->pkt->pkttype == PKT_RING_TRUST) { putchar('\n'); any=1; if( opt.fingerprint ) - print_fingerprint (pk, 0); + print_fingerprint (NULL, pk, 0); printf("rtv:1:%u:\n", node->next->pkt->pkt.ring_trust->trustval ); } @@ -991,7 +991,7 @@ list_node( CTX c, KBNODE node ) putchar(':'); putchar('\n'); if( opt.fingerprint && !any ) - print_fingerprint ( pk, 0 ); + print_fingerprint (NULL, pk, 0 ); if( opt.with_colons && node->next && node->next->pkt->pkttype == PKT_RING_TRUST ) { @@ -1030,7 +1030,7 @@ list_node( CTX c, KBNODE node ) if( !any ) putchar('\n'); if( !mainkey && opt.fingerprint > 1 ) - print_fingerprint( pk, 0 ); + print_fingerprint (NULL, pk, 0); } else if( (mainkey = (node->pkt->pkttype == PKT_SECRET_KEY) ) || node->pkt->pkttype == PKT_SECRET_SUBKEY ) { |