From 2998d20efc43315dae102efb739a61e137595291 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Mon, 20 Jul 2015 19:39:47 +0300
Subject: [PATCH] iproto: fix a compile error
---
src/iproto.cc | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/iproto.cc b/src/iproto.cc
index 5488b5cb96..da32965eaa 100644
--- a/src/iproto.cc
+++ b/src/iproto.cc
@@ -548,8 +548,7 @@ iproto_session_on_input(struct ev_io *watcher,
static inline struct iobuf *
iproto_session_output_iobuf(struct iproto_session *session)
{
- if (obuf_size(&session->iobuf[1]->out) &&
- obuf_size(&session->iobuf[1]->out) > con->write_pos.size)
+ if (obuf_size(&session->iobuf[1]->out) > session->write_pos.size)
return session->iobuf[1];
/*
* Don't try to write from a newer buffer if an older one
@@ -558,8 +557,7 @@ iproto_session_output_iobuf(struct iproto_session *session)
* pieces of replies from both buffers.
*/
if (ibuf_size(&session->iobuf[1]->in) == 0 &&
- obuf_size(&session->iobuf[0]->out)
- obuf_size(&session->iobuf[0]->out) > con->write_pos.size)
+ obuf_size(&session->iobuf[0]->out) > session->write_pos.size)
return session->iobuf[0];
return NULL;
}
--
GitLab