From b008274afdbe375b32a7e66dbd073e200f6f0587 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 4 Feb 2011 12:57:53 +0100 Subject: Nuked almost all trailing white space. 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. --- g10/kbnode.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'g10/kbnode.c') 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 (); } } -- cgit v1.2.3