From a23c30fb59c0a216763a7972028995d3be42a844 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 22 Jan 2015 09:45:45 +0100
Subject: [PATCH] gpg: Remove an unused variable.

* g10/getkey.c (getkey_ctx_s): Remove last_rc.
---
 g10/getkey.c       | 2 --
 g10/parse-packet.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/g10/getkey.c b/g10/getkey.c
index f8cb869a7..9267dbbdd 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -52,7 +52,6 @@ struct getkey_ctx_s
   KBPOS kbpos;
   KBNODE found_key;	 /* Pointer into some keyblock. */
   strlist_t extra_list;	 /* Will be freed when releasing the context.  */
-  int last_rc;
   int req_usage;
   int req_algo;
   KEYDB_HANDLE kr_handle;
@@ -2587,7 +2586,6 @@ found:
   release_kbnode (ctx->keyblock);
   ctx->keyblock = NULL;
 
-  ctx->last_rc = rc;
   return rc;
 }
 
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 1de7307f1..f3b4f49b5 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1954,7 +1954,7 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
   else if (version == 4)
     {
       /* The only supported version.  Use an older gpg
-         versions (i.e. gpg 1.4 to parse v3 packets).  */
+         version (i.e. gpg 1.4) to parse v3 packets.  */
     }
   else if (version == 2 || version == 3)
     {