gpg: Fix warnings about useless assignments.

* g10/armor.c (parse_hash_header): Remove duplicate var assignment.
* g10/getkey.c (cache_user_id): Ditto.
* g10/keygen.c (ask_curve): Ditto.  This also fixes a small memory
leak.

* g10/keygen.c (proc_parameter_file): Remove useless assignment or
pointer increment.
(generate_keypair): Ditto.
* g10/getkey.c (finish_lookup, lookup): Ditto.
* g10/card-util.c (change_pin): Ditto.
* g10/gpg.c (main) <aVerify>: Ditto.
* g10/import.c (import): Ditto.
(print_import_check): Ditto
* g10/keyring.c (do_copy): Ditto.
* g10/tdbio.c (tdbio_read_record): Ditto.
* g10/trustdb.c (tdb_update_ownertrust): Ditto.
(update_validity): Ditto.

* g10/server.c (cmd_passwd): Remove useless call to skip_options.

--

Signed-off-by: Werner Koch <[email protected]>

1 files changed, 2 insertions, 3 deletions

diff --git a/g10/getkey.c b/g10/getkey.c
index 86a3c8061..6a1fce6da 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -300,7 +300,8 @@ cache_user_id (KBNODE keyblock)
 	  /* First check for duplicates.  */
 	  for (r = user_id_db; r; r = r->next)
 	    {
-	      keyid_list_t b = r->keyids;
+	      keyid_list_t b;
+
 	      for (b = r->keyids; b; b = b->next)
 		{
 		  if (!memcmp (b->fpr, a->fpr, MAX_FINGERPRINT_LEN))
@@ -2997,7 +2998,6 @@ finish_lookup (GETKEY_CTX ctx, KBNODE keyblock)
 	  if (DBG_LOOKUP)
 	    log_debug ("\tprimary key may be used\n");
 	  latest_key = keyblock;
-	  latest_date = pk->timestamp;
 	}
     }
 
@@ -3074,7 +3074,6 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, kbnode_t *ret_found_key,
       if (rc)
 	{
 	  log_error ("keydb_get_keyblock failed: %s\n", gpg_strerror (rc));
-	  rc = 0;
 	  goto skip;
 	}