shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 02:38:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

connect: Don't shadow errno.

Browse Source
This commit is contained in:
Andreas Schneider
2010-05-12 20:30:52 +02:00
parent 40c1a7e91f
commit 56c867edfa
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libssh/client.c
View File

@@ -50,15 +50,15 @@
* @param code one of SSH_SOCKET_CONNECTED_OK or SSH_SOCKET_CONNECTED_ERROR * @param code one of SSH_SOCKET_CONNECTED_OK or SSH_SOCKET_CONNECTED_ERROR
* @param user is a pointer to session * @param user is a pointer to session
*/ */
static void socket_callback_connected(int code, int errno, void *user){ static void socket_callback_connected(int code, int errno_code, void *user){
ssh_session session=(ssh_session)user; ssh_session session=(ssh_session)user;
enter_function(); enter_function();
ssh_log(session,SSH_LOG_RARE,"Socket connection callback: %d (%d)",code, errno); ssh_log(session,SSH_LOG_RARE,"Socket connection callback: %d (%d)",code, errno_code);
if(code == SSH_SOCKET_CONNECTED_OK) if(code == SSH_SOCKET_CONNECTED_OK)
session->session_state=SSH_SESSION_STATE_SOCKET_CONNECTED; session->session_state=SSH_SESSION_STATE_SOCKET_CONNECTED;
else { else {
session->session_state=SSH_SESSION_STATE_ERROR; session->session_state=SSH_SESSION_STATE_ERROR;
ssh_set_error(session,SSH_FATAL,"%s",strerror(errno)); ssh_set_error(session,SSH_FATAL,"%s",strerror(errno_code));
} }
ssh_connection_callback(session); ssh_connection_callback(session);
leave_function(); leave_function();
@@ -69,12 +69,12 @@ static void socket_callback_connected(int code, int errno, void *user){
* @brief Callback to be called when the socket received an exception code. * @brief Callback to be called when the socket received an exception code.
* @param user is a pointer to session * @param user is a pointer to session
*/ */
static void socket_callback_exception(int code, int errno, void *user){ static void socket_callback_exception(int code, int errno_code, void *user){
ssh_session session=(ssh_session)user; ssh_session session=(ssh_session)user;
enter_function(); enter_function();
ssh_log(session,SSH_LOG_RARE,"Socket exception callback: %d (%d)",code, errno); ssh_log(session,SSH_LOG_RARE,"Socket exception callback: %d (%d)",code, errno_code);
session->session_state=SSH_SESSION_STATE_ERROR; session->session_state=SSH_SESSION_STATE_ERROR;
ssh_set_error(session,SSH_FATAL,"Socket error: %s",strerror(errno)); ssh_set_error(session,SSH_FATAL,"Socket error: %s",strerror(errno_code));
ssh_connection_callback(session); ssh_connection_callback(session);
leave_function(); leave_function();
} }