MINOR: buffer: replace calls to buffer_space_wraps() with b_space_wraps()
And remove the unused function.
diff --git a/include/common/buffer.h b/include/common/buffer.h
index d7687f9..ac56ae9 100644
--- a/include/common/buffer.h
+++ b/include/common/buffer.h
@@ -217,37 +217,6 @@
return !buffer_not_empty(buf);
}
-/* Return non-zero only if the buffer's free space wraps :
- * [ |oooo| ] => yes
- * [ |iiii| ] => yes
- * [ |oooo|iiii| ] => yes
- * [oooo| ] => no
- * [ |oooo] => no
- * [iiii| ] => no
- * [ |iiii] => no
- * [oooo|iiii| ] => no
- * [ |oooo|iiii] => no
- * [iiii| |oooo] => no
- * [oo|iiii| |oo] => no
- * [iiii| |oo|ii] => no
- * [oooooooooo|iiiiiiiiiii] => no
- * [iiiiiiiiiiiii|oooooooo] => no
- *
- * So the only case where the buffer does not wrap is when there's data either
- * at the beginning or at the end of the buffer. Thus we have this :
- * - if (p+i >= size) ==> doesn't wrap
- * - if (p-data <= o) ==> doesn't wrap
- * - otherwise wraps
- */
-static inline int buffer_space_wraps(const struct buffer *buf)
-{
- if (buf->p + buf->i >= buf->data + buf->size)
- return 0;
- if (buf->p <= buf->data + buf->o)
- return 0;
- return 1;
-}
-
/* Returns non-zero if the buffer's INPUT is considered full, which means that
* it holds at least as much INPUT data as (size - reserve). This also means
* that data that are scheduled for output are considered as potential free
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 9a1d718..8aab234 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -2684,7 +2684,7 @@
goto fail;
}
- if (unlikely(buffer_space_wraps(buf))) {
+ if (unlikely(b_space_wraps(buf))) {
/* it doesn't fit and the buffer is fragmented,
* so let's defragment it and try again.
*/
@@ -2992,7 +2992,7 @@
outbuf.size = bo_contig_space(h2c->mbuf);
outbuf.len = 0;
- if (outbuf.size >= 9 || !buffer_space_wraps(h2c->mbuf))
+ if (outbuf.size >= 9 || !b_space_wraps(h2c->mbuf))
break;
realign_again:
b_slow_realign(h2c->mbuf, trash.str, h2c->mbuf->o);
@@ -3030,7 +3030,7 @@
outbuf.str[outbuf.len++] = list[0].v.ptr[2];
}
else {
- if (buffer_space_wraps(h2c->mbuf))
+ if (b_space_wraps(h2c->mbuf))
goto realign_again;
h2c->flags |= H2_CF_MUX_MFULL;
@@ -3054,7 +3054,7 @@
if (!hpack_encode_header(&outbuf, list[hdr].n, list[hdr].v)) {
/* output full */
- if (buffer_space_wraps(h2c->mbuf))
+ if (b_space_wraps(h2c->mbuf))
goto realign_again;
h2c->flags |= H2_CF_MUX_MFULL;
@@ -3150,7 +3150,7 @@
outbuf.size = bo_contig_space(h2c->mbuf);
outbuf.len = 0;
- if (outbuf.size >= 9 || !buffer_space_wraps(h2c->mbuf))
+ if (outbuf.size >= 9 || !b_space_wraps(h2c->mbuf))
break;
realign_again:
b_slow_realign(h2c->mbuf, trash.str, h2c->mbuf->o);
@@ -3250,7 +3250,7 @@
/* we have an opportunity for enlarging the too small
* available space, let's try.
*/
- if (buffer_space_wraps(h2c->mbuf))
+ if (b_space_wraps(h2c->mbuf))
goto realign_again;
size = outbuf.size - 9;
}