mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
g10: Move more flags into the flag bitfield.
* g10/packet.h (PKT_user_id): Move 'is_primary', 'is_revoked', and 'is_expired' into the flags bitfield, and drop the prefix. * g10/call-dirmngr.c: Adapt accordingly. * g10/export.c: Likewise. * g10/getkey.c: Likewise. * g10/import.c: Likewise. * g10/kbnode.c: Likewise. * g10/keyedit.c: Likewise. * g10/keylist.c: Likewise. * g10/keyserver.c: Likewise. * g10/mainproc.c: Likewise. * g10/pkclist.c: Likewise. * g10/pubkey-enc.c: Likewise. * g10/tofu.c: Likewise. * g10/trust.c: Likewise. * g10/trustdb.c: Likewise. -- This patch has been created by applying the following semantic patch: @@ expression E; @@ -E->is_expired +E->flags.expired @@ expression E; @@ -E->is_primary +E->flags.primary @@ expression E; @@ -E->is_revoked +E->flags.revoked Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
parent
8f02864223
commit
2649fdfff5
15 changed files with 90 additions and 92 deletions
|
@ -849,9 +849,8 @@ dump_attribs (const PKT_user_id *uid, PKT_public_key *pk)
|
|||
(ulong) uid->attribs[i].len, uid->attribs[i].type, i + 1,
|
||||
uid->numattribs, (ulong) uid->created,
|
||||
(ulong) uid->expiredate,
|
||||
((uid->is_primary ? 0x01 : 0) | (uid->
|
||||
is_revoked ? 0x02 : 0) |
|
||||
(uid->is_expired ? 0x04 : 0)));
|
||||
((uid->flags.primary ? 0x01 : 0) | (uid->flags.revoked ? 0x02 : 0) |
|
||||
(uid->flags.expired ? 0x04 : 0)));
|
||||
write_status_text (STATUS_ATTRIBUTE, buf);
|
||||
}
|
||||
|
||||
|
@ -926,7 +925,7 @@ list_keyblock_print (ctrl_t ctrl, kbnode_t keyblock, int secret, int fpr,
|
|||
int indent;
|
||||
int kl = opt.keyid_format == KF_NONE? 10 : keystrlen ();
|
||||
|
||||
if ((uid->is_expired || uid->is_revoked)
|
||||
if ((uid->flags.expired || uid->flags.revoked)
|
||||
&& !(opt.list_options & LIST_SHOW_UNUSABLE_UIDS))
|
||||
{
|
||||
skip_sigs = 1;
|
||||
|
@ -938,7 +937,7 @@ list_keyblock_print (ctrl_t ctrl, kbnode_t keyblock, int secret, int fpr,
|
|||
if (attrib_fp && uid->attrib_data != NULL)
|
||||
dump_attribs (uid, pk);
|
||||
|
||||
if ((uid->is_revoked || uid->is_expired)
|
||||
if ((uid->flags.revoked || uid->flags.expired)
|
||||
|| ((opt.list_options & LIST_SHOW_UID_VALIDITY)
|
||||
&& !listctx->no_validity))
|
||||
{
|
||||
|
@ -1297,9 +1296,9 @@ list_keyblock_colon (ctrl_t ctrl, kbnode_t keyblock,
|
|||
if (attrib_fp && uid->attrib_data != NULL)
|
||||
dump_attribs (uid, pk);
|
||||
|
||||
if (uid->is_revoked)
|
||||
if (uid->flags.revoked)
|
||||
uid_validity = 'r';
|
||||
else if (uid->is_expired)
|
||||
else if (uid->flags.expired)
|
||||
uid_validity = 'e';
|
||||
else if (opt.no_expensive_trust_checks)
|
||||
uid_validity = 0;
|
||||
|
@ -1556,7 +1555,7 @@ do_reorder_keyblock (KBNODE keyblock, int attr)
|
|||
if (node->pkt->pkttype == PKT_USER_ID &&
|
||||
((attr && node->pkt->pkt.user_id->attrib_data) ||
|
||||
(!attr && !node->pkt->pkt.user_id->attrib_data)) &&
|
||||
node->pkt->pkt.user_id->is_primary)
|
||||
node->pkt->pkt.user_id->flags.primary)
|
||||
{
|
||||
primary = primary2 = node;
|
||||
for (node = node->next; node; primary2 = node, node = node->next)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue