From: Willy Tarreau <w@1wt.eu>
Date: Fri, 15 Jun 2018 13:14:53 +0000 (+0200)
Subject: MINOR: buffer: replace buffer_pending() with ci_data()
X-Git-Tag: v1.9-dev1~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ba65521a393c999f0717a746a3d4ea301a97b9e;p=thirdparty%2Fhaproxy.git

MINOR: buffer: replace buffer_pending() with ci_data()

It used to return b->i for channels, which is what ci_data() does.
---

diff --git a/include/common/buffer.h b/include/common/buffer.h
index 648e7b635d..18b5aa4ae9 100644
--- a/include/common/buffer.h
+++ b/include/common/buffer.h
@@ -103,14 +103,6 @@ static inline int buffer_count(const struct buffer *buf, const char *from, const
 	return count;
 }
 
-/* returns the amount of pending bytes in the buffer. It is the amount of bytes
- * that is not scheduled to be sent.
- */
-static inline int buffer_pending(const struct buffer *buf)
-{
-	return buf->i;
-}
-
 /* Return 1 if the buffer has less than 1/4 of its capacity free, otherwise 0 */
 static inline int buffer_almost_full(const struct buffer *buf)
 {
diff --git a/src/filters.c b/src/filters.c
index 26bed64f52..69a03310e2 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -1094,7 +1094,7 @@ flt_xfer_data(struct stream *s, struct channel *chn, unsigned int an_bit)
 	/* Stop waiting data if the input in closed and no data is pending or if
 	 * the output is closed. */
 	if ((chn->flags & CF_SHUTW) ||
-	    ((chn->flags & CF_SHUTR) && !buffer_pending(chn->buf))) {
+	    ((chn->flags & CF_SHUTR) && !ci_data(chn))) {
 		ret = 1;
 		goto end;
 	}
diff --git a/src/proto_http.c b/src/proto_http.c
index 7f90373212..88cb636035 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -6158,7 +6158,7 @@ int http_response_forward_body(struct stream *s, struct channel *res, int an_bit
 		if ((s->req.flags & (CF_SHUTR|CF_SHUTW)) == (CF_SHUTR|CF_SHUTW))
 			goto aborted_xfer;
 		/* If we have some pending data, we continue the processing */
-		if (!buffer_pending(res->buf)) {
+		if (!ci_data(res)) {
 			if (!(s->flags & SF_ERR_MASK))
 				s->flags |= SF_ERR_SRVCL;
 			HA_ATOMIC_ADD(&s->be->be_counters.srv_aborts, 1);