re-indented _libssh2_channel_packet_data_len() somewhat to make the huge

condition somewhat easier on the eye
This commit is contained in:
Daniel Stenberg 2009-03-17 14:44:38 +00:00
parent cc5e952fa0
commit 0b7f20566c

View File

@ -1695,20 +1695,16 @@ _libssh2_channel_packet_data_len(LIBSSH2_CHANNEL * channel, int stream_id)
&& (read_packet->data[0] == SSH_MSG_CHANNEL_EXTENDED_DATA) && (read_packet->data[0] == SSH_MSG_CHANNEL_EXTENDED_DATA)
&& (channel->local.id == read_local_id) && (channel->local.id == read_local_id)
&& (stream_id == (int) _libssh2_ntohu32(read_packet->data + 5))) && (stream_id == (int) _libssh2_ntohu32(read_packet->data + 5)))
|| (!stream_id && (read_packet->data[0] == SSH_MSG_CHANNEL_DATA) ||
&& (channel->local.id == read_local_id)) ||
(!stream_id (!stream_id
&& (read_packet-> && (read_packet->data[0] == SSH_MSG_CHANNEL_DATA)
data[0] == && (channel->local.id == read_local_id))
SSH_MSG_CHANNEL_EXTENDED_DATA) ||
&& (channel-> (!stream_id
local.id == && (read_packet->data[0] == SSH_MSG_CHANNEL_EXTENDED_DATA)
read_local_id) && (channel->local.id == read_local_id)
&& (channel-> && (channel->remote.extended_data_ignore_mode
remote. == LIBSSH2_CHANNEL_EXTENDED_DATA_MERGE)))
extended_data_ignore_mode
==
LIBSSH2_CHANNEL_EXTENDED_DATA_MERGE)))
{ {
return (read_packet->data_len - read_packet->data_head); return (read_packet->data_len - read_packet->data_head);
} }