diff options
| author | Werner Koch <wk@gnupg.org> | 2011-02-04 12:57:53 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2011-02-04 12:57:53 +0100 |
| commit | b008274afdbe375b32a7e66dbd073e200f6f0587 (patch) | |
| tree | 219e239d39cf06be3f03aa82fb572080ac163a15 /g10/kbnode.c | |
| parent | Let autogen.sh check the git config (diff) | |
| download | gnupg2-b008274afdbe375b32a7e66dbd073e200f6f0587.tar.xz gnupg2-b008274afdbe375b32a7e66dbd073e200f6f0587.zip | |
Nuked almost all trailing white space.post-nuke-of-trailing-ws
We better do this once and for all instead of cluttering all future
commits with diffs of trailing white spaces. In the majority of cases
blank or single lines are affected and thus this change won't disturb
a git blame too much. For future commits the pre-commit scripts
checks that this won't happen again.
Diffstat (limited to 'g10/kbnode.c')
| -rw-r--r-- | g10/kbnode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/kbnode.c b/g10/kbnode.c index 7309af12a..1a8b91e43 100644 --- a/g10/kbnode.c +++ b/g10/kbnode.c @@ -184,7 +184,7 @@ find_next_kbnode( KBNODE node, int pkttype ) for( node=node->next ; node; node = node->next ) { if( !pkttype ) return node; - else if( pkttype == PKT_USER_ID + else if( pkttype == PKT_USER_ID && ( node->pkt->pkttype == PKT_PUBLIC_KEY || node->pkt->pkttype == PKT_SECRET_KEY ) ) return NULL; @@ -338,7 +338,7 @@ move_kbnode( KBNODE *root, KBNODE node, KBNODE where ) void dump_kbnode (KBNODE node) { - for (; node; node = node->next ) + for (; node; node = node->next ) { const char *s; switch (node->pkt->pkttype) @@ -395,12 +395,12 @@ dump_kbnode (KBNODE node) log_printf (" keyid=%08lX a=%d u=%d %c%c%c%c\n", (ulong)keyid_from_pk( pk, NULL ), pk->pubkey_algo, pk->pubkey_usage, - pk->has_expired? 'e':'.', - pk->flags.revoked? 'r':'.', + pk->has_expired? 'e':'.', + pk->flags.revoked? 'r':'.', pk->flags.valid? 'v':'.', pk->flags.mdc? 'm':'.'); } - + log_flush (); } } |