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

* options.h, g10.c, keyedit.c, keylist.c, mainproc.c: Clarify the

Browse source 
plurarility (or not) of various list and verify options.
This commit is contained in:
David Shaw 2003-11-14 05:06:19 +00:00
parent fbadc93876
commit 80caf9957f
6 changed files with 81 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

12
g10/keyedit.c
View file

@ -145,7 +145,7 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
sig->flags.expired?'X':' ',
(sig->trust_depth>9)?'T':
(sig->trust_depth>0)?'0'+sig->trust_depth:' ');
if(opt.list_options&LIST_SHOW_LONG_KEYID)
if(opt.list_options&LIST_SHOW_LONG_KEYIDS)
tty_printf("%08lX%08lX",(ulong)sig->keyid[0],(ulong)sig->keyid[1]);
else
tty_printf("%08lX",(ulong)sig->keyid[1]);
@ -169,13 +169,13 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
}
tty_printf("\n");
if(sig->flags.policy_url && (opt.list_options&LIST_SHOW_POLICY))
if(sig->flags.policy_url && (opt.list_options&LIST_SHOW_POLICY_URLS))
show_policy_url(sig,3,0);
if(sig->flags.notation && (opt.list_options&LIST_SHOW_NOTATION))
if(sig->flags.notation && (opt.list_options&LIST_SHOW_NOTATIONS))
show_notation(sig,3,0);
if(sig->flags.pref_ks && (opt.list_options&LIST_SHOW_KEYSERVER))
if(sig->flags.pref_ks && (opt.list_options&LIST_SHOW_KEYSERVER_URLS))
show_keyserver_url(sig,3,0);
}
@ -2068,7 +2068,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
nbits_from_pk( pk ),
pubkey_letter( pk->pubkey_algo ));
if(opt.list_options&LIST_SHOW_LONG_KEYID)
if(opt.list_options&LIST_SHOW_LONG_KEYIDS)
tty_printf("%08lX",(ulong)pk->keyid[0]);
tty_printf("%08lX ",(ulong)pk->keyid[1]);
@ -2082,7 +2082,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
if(opt.trust_model!=TM_ALWAYS)
{
tty_printf(" ");
if(opt.list_options&LIST_SHOW_LONG_KEYID)
if(opt.list_options&LIST_SHOW_LONG_KEYIDS)
tty_printf(" ");
/* Ownertrust is only meaningful for the PGP or
classic trust models */