From: Willy Tarreau <w@1wt.eu>
Date: Wed, 14 Jan 2015 19:25:34 +0000 (+0100)
Subject: MINOR: channel: rename bi_avail() to channel_recv_max()
X-Git-Tag: v1.6-dev1~189
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5051f87421bb03504ccac160843704a7cd711b5;p=thirdparty%2Fhaproxy.git

MINOR: channel: rename bi_avail() to channel_recv_max()

This name more accurately reminds that it applies to a channel and not
to a buffer, and that what is returned may be used as a max number of
bytes to pass to recv().
---

diff --git a/include/proto/channel.h b/include/proto/channel.h
index 15ff1a95ac..db179cad49 100644
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -324,7 +324,7 @@ static inline int channel_recv_limit(const struct channel *chn)
  * is close to happen. The test is optimized to avoid as many operations as
  * possible for the fast case.
  */
-static inline int bi_avail(const struct channel *chn)
+static inline int channel_recv_max(const struct channel *chn)
 {
 	int ret;
 
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 19adcee9a1..f05f4a8f27 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -1181,7 +1181,7 @@ static void si_conn_recv_cb(struct connection *conn)
 	 * recv().
 	 */
 	while (!(conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH | CO_FL_DATA_RD_SH | CO_FL_WAIT_ROOM | CO_FL_HANDSHAKE))) {
-		max = bi_avail(chn);
+		max = channel_recv_max(chn);
 
 		if (!max) {
 			si->flags |= SI_FL_WAIT_ROOM;