sftp: Reformat sftp_packet_read()

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2018-09-03 14:34:38 +02:00
parent 79a3fcac72
commit afc14fe003

View File

@@ -313,7 +313,8 @@ int sftp_packet_write(sftp_session sftp, uint8_t type, ssh_buffer payload){
return size; return size;
} }
sftp_packet sftp_packet_read(sftp_session sftp) { sftp_packet sftp_packet_read(sftp_session sftp)
{
unsigned char buffer[MAX_BUF_SIZE]; unsigned char buffer[MAX_BUF_SIZE];
sftp_packet packet = NULL; sftp_packet packet = NULL;
uint32_t tmp; uint32_t tmp;
@@ -385,8 +386,10 @@ sftp_packet sftp_packet_read(sftp_session sftp) {
goto error; goto error;
} }
while (size > 0 && size < UINT_MAX) { while (size > 0 && size < UINT_MAX) {
r=ssh_channel_read(sftp->channel,buffer, r = ssh_channel_read(sftp->channel,
sizeof(buffer)>size ? size:sizeof(buffer),0); buffer,
sizeof(buffer) > size ? size : sizeof(buffer),
0);
if (r < 0) { if (r < 0) {
/* TODO: check if there are cases where an error needs to be set here */ /* TODO: check if there are cases where an error needs to be set here */