From c11c23b6acd3c6df79bb772c8698cf0858ae0ea7 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 28 Sep 2009 14:37:48 +0000 Subject: Rename encode.c to encrypt.c. Rename function in a simlar way. Re-indent encrypt.c --- g10/trustdb.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'g10/trustdb.c') diff --git a/g10/trustdb.c b/g10/trustdb.c index 1d083a738..2db971526 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -1176,12 +1176,15 @@ get_validity (PKT_public_key *pk, PKT_user_id *uid) int get_validity_info (PKT_public_key *pk, PKT_user_id *uid) { - int trustlevel; - - trustlevel = get_validity (pk, uid); - if( trustlevel & TRUST_FLAG_REVOKED ) - return 'r'; - return trust_letter ( trustlevel ); + int trustlevel; + + if (!pk) + return '?'; /* Just in case a NULL PK is passed. */ + + trustlevel = get_validity (pk, uid); + if ( (trustlevel & TRUST_FLAG_REVOKED) ) + return 'r'; + return trust_letter (trustlevel); } const char * @@ -1189,6 +1192,9 @@ get_validity_string (PKT_public_key *pk, PKT_user_id *uid) { int trustlevel; + if (!pk) + return "err"; /* Just in case a NULL PK is passed. */ + trustlevel = get_validity (pk, uid); if( trustlevel & TRUST_FLAG_REVOKED ) return _("revoked"); -- cgit v1.2.3