generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

src/agent.c: Simplify _libssh2_send() error checking ever so slightly

Browse Source
This commit is contained in:
Peter Stuge 2010-11-13 01:50:24 +01:00
parent ca2e81eb1f
commit e8c44e789f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/agent.c
View File

@ -178,12 +178,11 @@ agent_transact_unix(LIBSSH2_AGENT *agent, agent_transaction_ctx_t transctx)
if (transctx->state == agent_NB_state_request_created) { if (transctx->state == agent_NB_state_request_created) {
_libssh2_htonu32(buf, transctx->request_len); _libssh2_htonu32(buf, transctx->request_len);
rc = _libssh2_send(agent->fd, buf, sizeof buf, 0); rc = _libssh2_send(agent->fd, buf, sizeof buf, 0);
if (rc < 0) { if (rc == -EAGAIN)
if (rc == -EAGAIN) return LIBSSH2_ERROR_EAGAIN;
return LIBSSH2_ERROR_EAGAIN; else if (rc < 0)
return _libssh2_error(agent->session, LIBSSH2_ERROR_SOCKET_SEND, return _libssh2_error(agent->session, LIBSSH2_ERROR_SOCKET_SEND,
"agent send failed"); "agent send failed");
}
transctx->state = agent_NB_state_request_length_sent; transctx->state = agent_NB_state_request_length_sent;
} }
@ -191,12 +190,11 @@ agent_transact_unix(LIBSSH2_AGENT *agent, agent_transaction_ctx_t transctx)
if (transctx->state == agent_NB_state_request_length_sent) { if (transctx->state == agent_NB_state_request_length_sent) {
rc = _libssh2_send(agent->fd, transctx->request, rc = _libssh2_send(agent->fd, transctx->request,
transctx->request_len, 0); transctx->request_len, 0);
if (rc < 0) { if (rc == -EAGAIN)
if (rc == -EAGAIN) return LIBSSH2_ERROR_EAGAIN;
return LIBSSH2_ERROR_EAGAIN; else if (rc < 0)
return _libssh2_error(agent->session, LIBSSH2_ERROR_SOCKET_SEND, return _libssh2_error(agent->session, LIBSSH2_ERROR_SOCKET_SEND,
"agent send failed"); "agent send failed");
}
transctx->state = agent_NB_state_request_sent; transctx->state = agent_NB_state_request_sent;
} }