From 2649fdfff5d9e227025956e015b67502fd4962c4 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Wed, 8 Mar 2017 11:01:22 +0100 Subject: 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 --- g10/pkclist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'g10/pkclist.c') diff --git a/g10/pkclist.c b/g10/pkclist.c index 698794ebf..bf43d5638 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -235,12 +235,12 @@ do_edit_ownertrust (ctrl_t ctrl, PKT_public_key *pk, int mode, { if (un->pkt->pkttype != PKT_USER_ID ) continue; - if (un->pkt->pkt.user_id->is_revoked ) + if (un->pkt->pkt.user_id->flags.revoked) continue; - if (un->pkt->pkt.user_id->is_expired ) + if (un->pkt->pkt.user_id->flags.expired) continue; /* Only skip textual primaries */ - if (un->pkt->pkt.user_id->is_primary + if (un->pkt->pkt.user_id->flags.primary && !un->pkt->pkt.user_id->attrib_data ) continue; -- cgit v1.2.3