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/src/flt_http_comp.c b/src/flt_http_comp.c
index 0ccf23b..99b18cc 100644
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -720,7 +720,10 @@
/* 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 56d2eed..e694c87 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -5526,7 +5526,9 @@
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) &&