From: Willy Tarreau <w@1wt.eu>
Date: Wed, 14 Jan 2015 19:21:43 +0000 (+0100)
Subject: MINOR: channel: rename buffer_max_len() to channel_recv_limit()
X-Git-Tag: v1.6-dev1~190
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f5096ddf2e801266b53ed413e0ef6da1c4ac2cc;p=thirdparty%2Fhaproxy.git

MINOR: channel: rename buffer_max_len() to channel_recv_limit()

Buffer_max_len() is ambiguous and misleading since it considers the
channel. The new name more accurately designates the size limit for
received data.
---

diff --git a/include/proto/channel.h b/include/proto/channel.h
index 1e786f37b6..15ff1a95ac 100644
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -311,10 +311,10 @@ static inline int channel_reserved(const struct channel *chn)
 }
 
 /* Return the max number of bytes the buffer can contain so that once all the
- * pending bytes are forwarded, the buffer still has global.tune.maxrewrite
+ * data in transit are forwarded, the buffer still has global.tune.maxrewrite
  * bytes free. The result sits between chn->size - maxrewrite and chn->size.
  */
-static inline int buffer_max_len(const struct channel *chn)
+static inline int channel_recv_limit(const struct channel *chn)
 {
 	return chn->buf->size - channel_reserved(chn);
 }
@@ -328,7 +328,7 @@ static inline int bi_avail(const struct channel *chn)
 {
 	int ret;
 
-	ret = buffer_max_len(chn) - chn->buf->i - chn->buf->o;
+	ret = channel_recv_limit(chn) - chn->buf->i - chn->buf->o;
 	if (ret < 0)
 		ret = 0;
 	return ret;
diff --git a/src/channel.c b/src/channel.c
index e9c5e12fdc..177ab5a88d 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -157,7 +157,7 @@ int bi_putblk(struct channel *chn, const char *blk, int len)
 	if (unlikely(channel_input_closed(chn)))
 		return -2;
 
-	max = buffer_max_len(chn);
+	max = channel_recv_limit(chn);
 	if (unlikely(len > max - buffer_len(chn->buf))) {
 		/* we can't write this chunk right now because the buffer is
 		 * almost full or because the block is too large. Return the
diff --git a/src/payload.c b/src/payload.c
index fe9fddaedd..bc3dedd865 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -213,8 +213,8 @@ smp_fetch_req_ssl_ver(struct proxy *px, struct session *s, void *l7, unsigned in
 	 * all the part of the request which fits in a buffer is already
 	 * there.
 	 */
-	if (msg_len > buffer_max_len(s->req) + s->req->buf->data - s->req->buf->p)
-		msg_len = buffer_max_len(s->req) + s->req->buf->data - s->req->buf->p;
+	if (msg_len > channel_recv_limit(s->req) + s->req->buf->data - s->req->buf->p)
+		msg_len = channel_recv_limit(s->req) + s->req->buf->data - s->req->buf->p;
 
 	if (bleft < msg_len)
 		goto too_short;