diff options
| author | Justus Winter <[email protected]> | 2017-03-08 10:01:22 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-03-08 12:31:10 +0000 |
| commit | 2649fdfff5d9e227025956e015b67502fd4962c4 (patch) | |
| tree | bb438851a7a66668a8a38ddba389c3f584da594b /g10/call-dirmngr.c | |
| parent | dirmngr: Do not put a keyserver into a new dirmngr.conf (diff) | |
| download | gnupg-2649fdfff5d9e227025956e015b67502fd4962c4.tar.gz gnupg-2649fdfff5d9e227025956e015b67502fd4962c4.zip | |
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 <[email protected]>
Diffstat (limited to 'g10/call-dirmngr.c')
| -rw-r--r-- | g10/call-dirmngr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c index a33cdc7d7..aa39155ac 100644 --- a/g10/call-dirmngr.c +++ b/g10/call-dirmngr.c @@ -987,9 +987,9 @@ ks_put_inq_cb (void *opaque, const char *line) int i; i = 0; - if (uid->is_revoked) + if (uid->flags.revoked) validity[i ++] = 'r'; - if (uid->is_expired) + if (uid->flags.expired) validity[i ++] = 'e'; validity[i] = '\0'; |