From 5bb1fb5cbc464f90f6e359de9b4548d8cb37fce1 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 30 Aug 2009 19:31:07 +0200 Subject: [PATCH] s/libssh2_channel_write_ex/_libssh2_channel_write internally --- src/publickey.c | 20 ++++++++++---------- src/scp.c | 28 ++++++++++++++-------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/publickey.c b/src/publickey.c index e5ed944..8ca499c 100644 --- a/src/publickey.c +++ b/src/publickey.c @@ -442,8 +442,8 @@ libssh2_publickey_init(LIBSSH2_SESSION * session) } if (session->pkeyInit_state == libssh2_NB_state_sent2) { - rc = libssh2_channel_write_ex(session->pkeyInit_channel, 0, - (char *) buffer, (s - buffer)); + rc = _libssh2_channel_write(session->pkeyInit_channel, 0, + (char *) buffer, (s - buffer)); if (rc == PACKET_EAGAIN) { libssh2_error(session, LIBSSH2_ERROR_EAGAIN, "Would block sending publickey version packet", 0); @@ -679,8 +679,8 @@ libssh2_publickey_add_ex(LIBSSH2_PUBLICKEY * pkey, const unsigned char *name, } if (pkey->add_state == libssh2_NB_state_created) { - rc = libssh2_channel_write_ex(channel, 0, (char *) pkey->add_packet, - (pkey->add_s - pkey->add_packet)); + rc = _libssh2_channel_write(channel, 0, (char *) pkey->add_packet, + (pkey->add_s - pkey->add_packet)); if (rc == PACKET_EAGAIN) { return rc; } else if ((pkey->add_s - pkey->add_packet) != rc) { @@ -755,8 +755,8 @@ libssh2_publickey_remove_ex(LIBSSH2_PUBLICKEY * pkey, } if (pkey->remove_state == libssh2_NB_state_created) { - rc = libssh2_channel_write_ex(channel, 0, (char *) pkey->remove_packet, - (pkey->remove_s - pkey->remove_packet)); + rc = _libssh2_channel_write(channel, 0, (char *) pkey->remove_packet, + (pkey->remove_s - pkey->remove_packet)); if (rc == PACKET_EAGAIN) { return rc; } else if ((pkey->remove_s - pkey->remove_packet) != rc) { @@ -816,10 +816,10 @@ libssh2_publickey_list_fetch(LIBSSH2_PUBLICKEY * pkey, unsigned long *num_keys, } if (pkey->listFetch_state == libssh2_NB_state_created) { - rc = libssh2_channel_write_ex(channel, 0, - (char *) pkey->listFetch_buffer, - (pkey->listFetch_s - - pkey->listFetch_buffer)); + rc = _libssh2_channel_write(channel, 0, + (char *) pkey->listFetch_buffer, + (pkey->listFetch_s - + pkey->listFetch_buffer)); if (rc == PACKET_EAGAIN) { return rc; } else if ((pkey->listFetch_s - pkey->listFetch_buffer) != rc) { diff --git a/src/scp.c b/src/scp.c index 6908755..c6598d7 100644 --- a/src/scp.c +++ b/src/scp.c @@ -357,8 +357,8 @@ libssh2_scp_recv(LIBSSH2_SESSION * session, const char *path, struct stat * sb) } if (session->scpRecv_state == libssh2_NB_state_sent1) { - rc = libssh2_channel_write_ex(session->scpRecv_channel, 0, - (char *) session->scpRecv_response, 1); + rc = _libssh2_channel_write(session->scpRecv_channel, 0, + (char *) session->scpRecv_response, 1); if (rc == PACKET_EAGAIN) { libssh2_error(session, LIBSSH2_ERROR_EAGAIN, "Would block sending initial wakeup", 0); @@ -557,9 +557,9 @@ libssh2_scp_recv(LIBSSH2_SESSION * session, const char *path, struct stat * sb) } if (session->scpRecv_state == libssh2_NB_state_sent3) { - rc = libssh2_channel_write_ex(session->scpRecv_channel, 0, - (char *) session-> - scpRecv_response, 1); + rc = _libssh2_channel_write(session->scpRecv_channel, 0, + (char *) session-> + scpRecv_response, 1); if (rc == PACKET_EAGAIN) { libssh2_error(session, LIBSSH2_ERROR_EAGAIN, "Would block waiting to send SCP ACK", 0); @@ -720,9 +720,9 @@ libssh2_scp_recv(LIBSSH2_SESSION * session, const char *path, struct stat * sb) } if (session->scpRecv_state == libssh2_NB_state_sent6) { - rc = libssh2_channel_write_ex(session->scpRecv_channel, 0, - (char *) session-> - scpRecv_response, 1); + rc = _libssh2_channel_write(session->scpRecv_channel, 0, + (char *) session-> + scpRecv_response, 1); if (rc == PACKET_EAGAIN) { libssh2_error(session, LIBSSH2_ERROR_EAGAIN, "Would block sending SCP ACK", 0); @@ -887,9 +887,9 @@ libssh2_scp_send_ex(LIBSSH2_SESSION * session, const char *path, int mode, /* Send mtime and atime to be used for file */ if (mtime || atime) { if (session->scpSend_state == libssh2_NB_state_sent2) { - rc = libssh2_channel_write_ex(session->scpSend_channel, 0, - (char *) session->scpSend_response, - session->scpSend_response_len); + rc = _libssh2_channel_write(session->scpSend_channel, 0, + (char *) session->scpSend_response, + session->scpSend_response_len); if (rc == PACKET_EAGAIN) { libssh2_error(session, LIBSSH2_ERROR_EAGAIN, "Would block sending time data for SCP file", 0); @@ -945,9 +945,9 @@ libssh2_scp_send_ex(LIBSSH2_SESSION * session, const char *path, int mode, } if (session->scpSend_state == libssh2_NB_state_sent5) { - rc = libssh2_channel_write_ex(session->scpSend_channel, 0, - (char *) session->scpSend_response, - session->scpSend_response_len); + rc = _libssh2_channel_write(session->scpSend_channel, 0, + (char *) session->scpSend_response, + session->scpSend_response_len); if (rc == PACKET_EAGAIN) { libssh2_error(session, LIBSSH2_ERROR_EAGAIN, "Would block send core file data for SCP file", 0);