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/pubkey-enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/pubkey-enc.c') diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c index cc962cfde..d2261b0b4 100644 --- a/g10/pubkey-enc.c +++ b/g10/pubkey-enc.c @@ -54,7 +54,7 @@ is_algo_in_prefs (kbnode_t keyblock, preftype_t type, int algo) PKT_user_id *uid = k->pkt->pkt.user_id; prefitem_t *prefs = uid->prefs; - if (uid->created && prefs && !uid->is_revoked && !uid->is_expired) + if (uid->created && prefs && !uid->flags.revoked && !uid->flags.expired) { for (; prefs->type; prefs++) if (prefs->type == type && prefs->value == algo) -- cgit v1.2.3