mirror of
git://git.gnupg.org/gnupg.git
synced 2025-04-11 22:01:08 +02:00
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 <gniibe@fsij.org>
This commit is contained in:
parent
adb77d095b
commit
36c4e540f1
@ -654,7 +654,7 @@ start_pinentry (ctrl_t ctrl)
|
|||||||
|
|
||||||
xfree (flavor_version);
|
xfree (flavor_version);
|
||||||
|
|
||||||
return 0;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -2576,7 +2576,6 @@ ssh_handler_request_identities (ctrl_t ctrl,
|
|||||||
|
|
||||||
key_public = NULL;
|
key_public = NULL;
|
||||||
key_counter = 0;
|
key_counter = 0;
|
||||||
err = 0;
|
|
||||||
|
|
||||||
key_blobs = es_fopenmem (0, "r+b");
|
key_blobs = es_fopenmem (0, "r+b");
|
||||||
if (! key_blobs)
|
if (! key_blobs)
|
||||||
|
@ -328,7 +328,7 @@ try_unprotect_cb (struct pin_entry_info_s *pi)
|
|||||||
xfree (desc);
|
xfree (desc);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -552,7 +552,6 @@ unprotect (ctrl_t ctrl, const char *cache_nonce, const char *desc_text,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
xfree (pw);
|
xfree (pw);
|
||||||
rc = 0;
|
|
||||||
}
|
}
|
||||||
else if (cache_mode == CACHE_MODE_NORMAL)
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
xfree (pw);
|
xfree (pw);
|
||||||
rc = 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2964,7 +2964,6 @@ handle_connections (gnupg_fd_t listen_fd,
|
|||||||
xfree (ctrl);
|
xfree (ctrl);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fd = GNUPG_INVALID_FD;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user