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/import.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'g10/import.c') diff --git a/g10/import.c b/g10/import.c index 640618af6..ea7a92f58 100644 --- a/g10/import.c +++ b/g10/import.c @@ -1189,15 +1189,15 @@ impex_filter_getval (void *cookie, const char *propname) } else if (!strcmp (propname, "primary")) { - result = uid->is_primary? "1":"0"; + result = uid->flags.primary? "1":"0"; } else if (!strcmp (propname, "expired")) { - result = uid->is_expired? "1":"0"; + result = uid->flags.expired? "1":"0"; } else if (!strcmp (propname, "revoked")) { - result = uid->is_revoked? "1":"0"; + result = uid->flags.revoked? "1":"0"; } else result = NULL; -- cgit v1.2.3