diff options
| author | Werner Koch <[email protected]> | 2019-05-21 10:54:47 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-05-21 11:02:32 +0000 |
| commit | 126caa34bbdb36f40514643b9d6f5ead3240c735 (patch) | |
| tree | e1e5d503bb731e773dfd19543c732b3704ef874f /g10/main.h | |
| parent | scd: Fix for SCARD_IO_REQUEST structure. (diff) | |
| download | gnupg-126caa34bbdb36f40514643b9d6f5ead3240c735.tar.gz gnupg-126caa34bbdb36f40514643b9d6f5ead3240c735.zip | |
gpg: Unify the the use of the print_pubkey_info functions.
* g10/keylist.c (format_seckey_info): Remove.
(print_pubkey_info, print_seckey_info): Remove.
(format_key_info): New.
(print_key_info): New.
(print_key_info_log): New.
* g10/card-util.c (current_card_status): Use print_key_info and remove
the useless condition on KEYBLOCK.
* g10/delkey.c (do_delete_key): Replace print_pubkey_info and
print_seckey_info by print_key_info.
* g10/keyedit.c (menu_addrevoker): Replace print_pubkey_info by
print_key_info.
* g10/pkclist.c (do_we_trust_pre): Ditto.
* g10/revoke.c (gen_desig_revoke): Ditto.
(gen_revoke): Ditto. Also use print_key_info_log instead of separate
functions.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/g10/main.h b/g10/main.h index 34a932b16..134d8b950 100644 --- a/g10/main.h +++ b/g10/main.h @@ -470,9 +470,10 @@ void show_keyserver_url(PKT_signature *sig,int indent,int mode); void show_notation(PKT_signature *sig,int indent,int mode,int which); void dump_attribs (const PKT_user_id *uid, PKT_public_key *pk); void set_attrib_fd(int fd); -char *format_seckey_info (ctrl_t ctrl, PKT_public_key *pk); -void print_seckey_info (ctrl_t ctrl, PKT_public_key *pk); -void print_pubkey_info (ctrl_t ctrl, estream_t fp, PKT_public_key *pk); +void print_key_info (ctrl_t ctrl, estream_t fp, int indent, + PKT_public_key *pk, int secret); +void print_key_info_log (ctrl_t ctrl, int loglevel, int indent, + PKT_public_key *pk, int secret); void print_card_key_info (estream_t fp, KBNODE keyblock); void print_key_line (ctrl_t ctrl, estream_t fp, PKT_public_key *pk, int secret); |