[Pkg-gnupg-commit] [gnupg2] 78/132: agent: Minor cleanup.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 45c52cca1401b930878a8f901b63cfbb22e9e327
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Apr 17 16:43:36 2017 +0900

    agent: Minor cleanup.
    
    * agent/command-ssh.c (ssh_key_to_protected_buffer): Not touch ERR.
    * agent/command.c (cmd_genkey, cmd_import_key): Clean up.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
 agent/command-ssh.c | 1 -
 agent/command.c     | 2 --
 2 files changed, 3 deletions(-)

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 5c7cf1f..fdde0fb 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -2975,7 +2975,6 @@ ssh_key_to_protected_buffer (gcry_sexp_t key, const char *passphrase,
   unsigned int buffer_new_n;
   gpg_error_t err;
 
-  err = 0;
   buffer_new_n = gcry_sexp_sprint (key, GCRYSEXP_FMT_CANON, NULL, 0);
   buffer_new = xtrymalloc_secure (buffer_new_n);
   if (! buffer_new)
diff --git a/agent/command.c b/agent/command.c
index ab6d7eb..bd184ac 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -927,7 +927,6 @@ cmd_genkey (assuan_context_t ctx, char *line)
     }
   line = skip_options (line);
 
-  p = line;
   for (p=line; *p && *p != ' ' && *p != '\t'; p++)
     ;
   *p = '\0';
@@ -2105,7 +2104,6 @@ cmd_import_key (assuan_context_t ctx, char *line)
   force = has_option (line, "--force");
   line = skip_options (line);
 
-  p = line;
   for (p=line; *p && *p != ' ' && *p != '\t'; p++)
     ;
   *p = '\0';

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git