diff options
| author | NIIBE Yutaka <[email protected]> | 2017-04-14 03:54:06 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-04-14 03:54:06 +0000 |
| commit | 36c4e540f1a4992675ee6e0acca1231325457079 (patch) | |
| tree | 688b2aedb0c66047fe18018250b25e1577ff55b1 | |
| parent | dirmngr: More fix for test program. (diff) | |
| download | gnupg-36c4e540f1a4992675ee6e0acca1231325457079.tar.gz gnupg-36c4e540f1a4992675ee6e0acca1231325457079.zip | |
agent: Clean up error initialize/return.
* agent/call-pinentry.c (start_pinentry): Return RC.
* agent/command-ssh.c (ssh_handler_request_identities): Don't set ERR.
* agent/findkey.c (try_unprotect_cb): Return ERR.
(unprotect): Don't set RC.
* agent/gpg-agent.c (handle_connections): Don't set fd.
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | agent/call-pinentry.c | 2 | ||||
| -rw-r--r-- | agent/command-ssh.c | 1 | ||||
| -rw-r--r-- | agent/findkey.c | 4 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 1 |
4 files changed, 2 insertions, 6 deletions
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c index a35a3fbff..6524cb1b6 100644 --- a/agent/call-pinentry.c +++ b/agent/call-pinentry.c @@ -654,7 +654,7 @@ start_pinentry (ctrl_t ctrl) xfree (flavor_version); - return 0; + return rc; } diff --git a/agent/command-ssh.c b/agent/command-ssh.c index eeb14988e..5c7cf1f26 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -2576,7 +2576,6 @@ ssh_handler_request_identities (ctrl_t ctrl, key_public = NULL; key_counter = 0; - err = 0; key_blobs = es_fopenmem (0, "r+b"); if (! key_blobs) diff --git a/agent/findkey.c b/agent/findkey.c index 0b2ddf1f9..f3c8ca986 100644 --- a/agent/findkey.c +++ b/agent/findkey.c @@ -328,7 +328,7 @@ try_unprotect_cb (struct pin_entry_info_s *pi) xfree (desc); } - return 0; + return err; } @@ -552,7 +552,6 @@ unprotect (ctrl_t ctrl, const char *cache_nonce, const char *desc_text, return 0; } xfree (pw); - rc = 0; } else if (cache_mode == CACHE_MODE_NORMAL) { @@ -590,7 +589,6 @@ unprotect (ctrl_t ctrl, const char *cache_nonce, const char *desc_text, return 0; } xfree (pw); - rc = 0; } } diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index e23f43858..c764be887 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -2964,7 +2964,6 @@ handle_connections (gnupg_fd_t listen_fd, xfree (ctrl); } } - fd = GNUPG_INVALID_FD; } } } |