From 5045133dc21af0d6ebed6edc43c091e3c8d9d0ce Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 13 Aug 2013 08:15:37 +0200 Subject: channel: Use MIN macro in channel_write_common(). --- src/channels.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/channels.c b/src/channels.c index f5b71a0..11792a9 100644 --- a/src/channels.c +++ b/src/channels.c @@ -1319,11 +1319,13 @@ int channel_write_common(ssh_channel channel, const void *data, goto out; continue; } - effectivelen = len > channel->remote_window ? channel->remote_window : len; + effectivelen = MIN(len, channel->remote_window); } else { effectivelen = len; } - effectivelen = effectivelen > maxpacketlen ? maxpacketlen : effectivelen; + + effectivelen = MIN(effectivelen, maxpacketlen);; + if (buffer_add_u8(session->out_buffer, is_stderr ? SSH2_MSG_CHANNEL_EXTENDED_DATA : SSH2_MSG_CHANNEL_DATA) < 0 || buffer_add_u32(session->out_buffer, -- cgit