diff options
author | Andreas Schneider <mail@cynapses.org> | 2009-04-22 14:48:00 +0000 |
---|---|---|
committer | Andreas Schneider <mail@cynapses.org> | 2009-04-22 14:48:00 +0000 |
commit | 6402559f28159984bd9067728da9c68f157ddd1f (patch) | |
tree | 7e70e91cea60b59824944296a382f8af85cd9cff | |
parent | 9766b2f8d2ecbba5be34a21a62c1b7790a8054b2 (diff) | |
download | libssh-6402559f28159984bd9067728da9c68f157ddd1f.tar.gz libssh-6402559f28159984bd9067728da9c68f157ddd1f.tar.xz libssh-6402559f28159984bd9067728da9c68f157ddd1f.zip |
Reformat sftp_packet_write().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@572 7dcaeef0-15fb-0310-b436-a5af3365683c
-rw-r--r-- | libssh/sftp.c | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/libssh/sftp.c b/libssh/sftp.c index 35b20b5..4b1ca26 100644 --- a/libssh/sftp.c +++ b/libssh/sftp.c @@ -190,24 +190,29 @@ void sftp_free(SFTP_SESSION *sftp){ } int sftp_packet_write(SFTP_SESSION *sftp,u8 type, BUFFER *payload){ - int size; - if (buffer_prepend_data(payload, &type, sizeof(u8)) < 0) { - return -1; - } - size=htonl(buffer_get_len(payload)); - if (buffer_prepend_data(payload, &size, sizeof(u32)) < 0) { - return -1; - } - size=channel_write(sftp->channel,buffer_get(payload),buffer_get_len(payload)); - if (size < 0) { - return -1; - } else if((u32) size != buffer_get_len(payload)){ - ssh_log(sftp->session, SSH_LOG_PACKET, - "Had to write %d bytes, wrote only %d", - buffer_get_len(payload), - size); - } - return size; + int size; + + if (buffer_prepend_data(payload, &type, sizeof(u8)) < 0) { + return -1; + } + + size = htonl(buffer_get_len(payload)); + if (buffer_prepend_data(payload, &size, sizeof(u32)) < 0) { + return -1; + } + + size = channel_write(sftp->channel, buffer_get(payload), + buffer_get_len(payload)); + if (size < 0) { + return -1; + } else if((u32) size != buffer_get_len(payload)) { + ssh_log(sftp->session, SSH_LOG_PACKET, + "Had to write %d bytes, wrote only %d", + buffer_get_len(payload), + size); + } + + return size; } SFTP_PACKET *sftp_packet_read(SFTP_SESSION *sftp){ |