MINOR: buffer: remove bo_contig_data()

The two call places now make use of b_contig_data(0) and check by
themselves that the returned size is no larger than the scheduled
output data.

diff --git a/include/common/buffer.h b/include/common/buffer.h
index 0c8eeb019988bcfc65fdca5648a263fd80458e53..8638bd6849eaa677c208a5fe91ba52481fe9435b 100644 (file)
--- a/include/common/buffer.h
+++ b/include/common/buffer.h
@@ -105,16 +105,6 @@ static inline void bo_del(struct buffer *b, unsigned int del)
        b->o -= del;
 }
 
-/* Returns the amount of output data that can contiguously be read at once */
-static inline int bo_contig_data(const struct buffer *b)
-{
-       char *beg = b->p - b->o;
-
-       if (beg < b->data)
-               return b->data - beg;
-       return b->o;
-}
-
 /* Return the amount of bytes that can be written into the input area at once
  * including reserved space which may be overwritten (this is the caller
  * responsibility to know if the reserved space is protected or not).

diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 0ccf23b12206dec51a60c25d8381c1a2316d2999..99b18cc4f722befe2f8bb3cee1ef568c2fa84847 100644 (file)
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -720,7 +720,10 @@ http_compression_buffer_end(struct comp_state *st, struct stream *s,
 
        /* Copy previous data from ib->o into ob->o */
        if (ib->o > 0) {
-               left = bo_contig_data(ib);
+               left = b_contig_data(ib, 0);
+               if (left > ib->o)
+                       left = ib->o;
+
                memcpy(ob->p - ob->o, b_head(ib), left);
                if (ib->o - left) /* second part of the buffer */
                        memcpy(ob->p - ob->o + left, ib->data, ib->o - left);

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 56d2eed7fa5d88b1f86a49f3b04c291351f82ba9..e694c8721e48620bc671aec9a34c1820301678e8 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -5526,7 +5526,9 @@ static int ssl_sock_from_buf(struct connection *conn, struct buffer *buf, int fl
                size_t written_data;
 #endif
 
-               try = bo_contig_data(buf);
+               try = b_contig_data(buf, 0);
+               if (try > buf->o)
+                       try = buf->o;
 
                if (!(flags & CO_SFL_STREAMER) &&
                    !(conn->xprt_st & SSL_SOCK_SEND_UNLIMITED) &&