From 77052d3a1e1c22e1882e7a12f63b4d705d81e2be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 16 Sep 2015 22:13:09 +0200 Subject: cleanup: use ssh_ prefix in the agent (non-static) functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Having "ssh_" prefix in the functions' name will avoid possible clashes when compiling libssh statically. Signed-off-by: Fabiano Fidêncio Reviewed-by: Andreas Schneider --- src/agent.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/agent.c') diff --git a/src/agent.c b/src/agent.c index e520773b..40fe334c 100644 --- a/src/agent.c +++ b/src/agent.c @@ -143,7 +143,7 @@ static size_t atomicio(struct ssh_agent_struct *agent, void *buf, size_t n, int } } -ssh_agent agent_new(struct ssh_session_struct *session) { +ssh_agent ssh_agent_new(struct ssh_session_struct *session) { ssh_agent agent = NULL; agent = malloc(sizeof(struct ssh_agent_struct)); @@ -205,7 +205,7 @@ int ssh_set_agent_socket(ssh_session session, socket_t fd){ return SSH_OK; } -void agent_close(struct ssh_agent_struct *agent) { +void ssh_agent_close(struct ssh_agent_struct *agent) { if (agent == NULL) { return; } @@ -213,13 +213,13 @@ void agent_close(struct ssh_agent_struct *agent) { ssh_socket_close(agent->sock); } -void agent_free(ssh_agent agent) { +void ssh_agent_free(ssh_agent agent) { if (agent) { if (agent->ident) { ssh_buffer_free(agent->ident); } if (agent->sock) { - agent_close(agent); + ssh_agent_close(agent); ssh_socket_free(agent->sock); } SAFE_FREE(agent); @@ -484,7 +484,7 @@ ssh_key ssh_agent_get_next_ident(struct ssh_session_struct *session, return key; } -int agent_is_running(ssh_session session) { +int ssh_agent_is_running(ssh_session session) { if (session == NULL || session->agent == NULL) { return 0; } -- cgit v1.2.3