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/export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/export.c') diff --git a/g10/export.c b/g10/export.c index 2da5309bd..a7aecd65a 100644 --- a/g10/export.c +++ b/g10/export.c @@ -1434,7 +1434,7 @@ print_pka_or_dane_records (iobuf_t out, kbnode_t keyblock, PKT_public_key *pk, continue; uid = node->pkt->pkt.user_id; - if (uid->is_expired || uid->is_revoked) + if (uid->flags.expired || uid->flags.revoked) continue; xfree (mbox); -- cgit v1.2.3