MINOR: buffer: replace buffer_empty() with b_empty() or c_empty()
For the same consistency reasons, let's use b_empty() at the few places
where an empty buffer is expected, or c_empty() if it's done on a channel.
Some of these places were there to realign the buffer so
{b,c}_realign_if_empty() was used instead.
diff --git a/include/common/buffer.h b/include/common/buffer.h
index e0b6c96..a05d58d 100644
--- a/include/common/buffer.h
+++ b/include/common/buffer.h
@@ -61,12 +61,6 @@
/***** FIXME: OLD API BELOW *****/
-/* Return non-zero only if the buffer is empty */
-static inline int buffer_empty(const struct buffer *buf)
-{
- return !b_data(buf);
-}
-
/* 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/include/proto/channel.h b/include/proto/channel.h
index 026574f..850f900 100644
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -685,7 +685,7 @@
* to wake up as many streams/applets as possible. */
static inline void channel_release_buffer(struct channel *chn, struct buffer_wait *wait)
{
- if (chn->buf->size && buffer_empty(chn->buf)) {
+ if (c_size(chn) && c_empty(chn)) {
b_free(&chn->buf);
offer_buffers(wait->target, tasks_run_queue);
}
@@ -728,8 +728,7 @@
static inline void co_skip(struct channel *chn, int len)
{
b_del(chn->buf, len);
- if (buffer_empty(chn->buf))
- chn->buf->p = chn->buf->data;
+ c_realign_if_empty(chn);
/* notify that some data was written to the SI from the buffer */
chn->flags |= CF_WRITE_PARTIAL | CF_WRITE_EVENT;
diff --git a/src/buffer.c b/src/buffer.c
index 416cb4c..16372bf 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -102,9 +102,7 @@
memcpy(pos, str, len);
b->i += delta;
-
- if (buffer_empty(b))
- b->p = b->data;
+ b_realign_if_empty(b);
return delta;
}
diff --git a/src/channel.c b/src/channel.c
index c5a51f7..1efab9c 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -205,7 +205,7 @@
if (unlikely(channel_input_closed(chn)))
return NULL;
- if (!chn->buf->size || !buffer_empty(chn->buf))
+ if (!c_size(chn) || !c_empty(chn))
return buf;
old = chn->buf;
diff --git a/src/raw_sock.c b/src/raw_sock.c
index 477862e..3ae7656 100644
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -276,9 +276,7 @@
}
}
- /* let's realign the buffer to optimize I/O */
- if (buffer_empty(buf))
- buf->p = buf->data;
+ b_realign_if_empty(buf);
/* read the largest possible block. For this, we perform only one call
* to recv() unless the buffer wraps and we exactly fill the first hunk,
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 42cb72f..9aa101b 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -5351,10 +5351,7 @@
/* a handshake was requested */
return 0;
- /* let's realign the buffer to optimize I/O */
- if (buffer_empty(buf)) {
- buf->p = buf->data;
- }
+ b_realign_if_empty(buf);
/* read the largest possible block. For this, we perform only one call
* to recv() unless the buffer wraps and we exactly fill the first hunk,
diff --git a/src/stream.c b/src/stream.c
index 30bfc67..e958423 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -456,11 +456,11 @@
{
int offer = 0;
- if (s->req.buf->size && buffer_empty(s->req.buf)) {
+ if (c_size(&s->req) && c_empty(&s->req)) {
offer = 1;
b_free(&s->req.buf);
}
- if (s->res.buf->size && buffer_empty(s->res.buf)) {
+ if (c_size(&s->res) && c_empty(&s->res)) {
offer = 1;
b_free(&s->res.buf);
}