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

Stop shadowing a global declaration

Browse Source
This commit is contained in:
Dan Fandrich 2007-09-28 18:29:40 +00:00
parent 80f6c7c6d1
commit 2d773f9322
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libssh2.h
View File

@ -309,7 +309,7 @@ LIBSSH2_API void **libssh2_session_abstract(LIBSSH2_SESSION *session);
LIBSSH2_API void *libssh2_session_callback_set(LIBSSH2_SESSION *session, int cbtype, void *callback); LIBSSH2_API void *libssh2_session_callback_set(LIBSSH2_SESSION *session, int cbtype, void *callback);
LIBSSH2_API int libssh2_banner_set(LIBSSH2_SESSION *session, const char *banner); LIBSSH2_API int libssh2_banner_set(LIBSSH2_SESSION *session, const char *banner);
LIBSSH2_API int libssh2_session_startup(LIBSSH2_SESSION *session, int socket); LIBSSH2_API int libssh2_session_startup(LIBSSH2_SESSION *session, int sock);
LIBSSH2_API int libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, const char *description, const char *lang); LIBSSH2_API int libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, const char *description, const char *lang);
#define libssh2_session_disconnect(session, description) libssh2_session_disconnect_ex((session), SSH_DISCONNECT_BY_APPLICATION, (description), "") #define libssh2_session_disconnect(session, description) libssh2_session_disconnect_ex((session), SSH_DISCONNECT_BY_APPLICATION, (description), "")
LIBSSH2_API int libssh2_session_free(LIBSSH2_SESSION *session); LIBSSH2_API int libssh2_session_free(LIBSSH2_SESSION *session);

8
src/session.c
View File

@ -516,21 +516,21 @@ libssh2_session_callback_set(LIBSSH2_SESSION * session,
* socket *must* be populated with an opened and connected socket. * socket *must* be populated with an opened and connected socket.
*/ */
LIBSSH2_API int LIBSSH2_API int
libssh2_session_startup(LIBSSH2_SESSION * session, int socket) libssh2_session_startup(LIBSSH2_SESSION * session, int sock)
{ {
int rc; int rc;
if (session->startup_state == libssh2_NB_state_idle) { if (session->startup_state == libssh2_NB_state_idle) {
_libssh2_debug(session, LIBSSH2_DBG_TRANS, _libssh2_debug(session, LIBSSH2_DBG_TRANS,
"session_startup for socket %d", socket); "session_startup for socket %d", sock);
/* FIXME: on some platforms (like win32) sockets are unsigned */ /* FIXME: on some platforms (like win32) sockets are unsigned */
if (socket < 0) { if (sock < 0) {
/* Did we forget something? */ /* Did we forget something? */
libssh2_error(session, LIBSSH2_ERROR_SOCKET_NONE, libssh2_error(session, LIBSSH2_ERROR_SOCKET_NONE,
"Bad socket provided", 0); "Bad socket provided", 0);
return LIBSSH2_ERROR_SOCKET_NONE; return LIBSSH2_ERROR_SOCKET_NONE;
} }
session->socket_fd = socket; session->socket_fd = sock;
session->socket_block = session->socket_block =
!_libssh2_get_socket_nonblocking(session->socket_fd); !_libssh2_get_socket_nonblocking(session->socket_fd);