RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-18 19:50:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: buffer: remove bo_end()

Browse Source 
It was replaced by either b_tail() when the buffer has no input data, or
b_peek(b, b->o).
This commit is contained in:
Willy Tarreau 2018-06-07 18:22:26 +02:00
parent 89faf5d7c3
commit 41e38ac0ee
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/common/buffer.h
View File

@ -117,12 +117,6 @@ static inline char *bi_end(const struct buffer *b)
return ret;
}
/* Returns the end of the output data in a buffer */
static inline char *bo_end(const struct buffer *b)
{
return b->p;
}
/* Returns the amount of output data that can contiguously be read at once */
static inline int bo_contig_data(const struct buffer *b)
{

2
src/h1.c
View File

@ -1220,7 +1220,7 @@ int h1_measure_trailers(const struct buffer *buf)
while (1) {
const char *p1 = NULL, *p2 = NULL;
const char *start = b_ptr(buf, (int)(count - buf->o));
const char *stop = bo_end(buf);
const char *stop = b_peek(buf, buf->o);
const char *ptr = start;
int bytes = 0;

4
src/mux_h2.c
View File

@ -2988,7 +2988,7 @@ static int h2s_frt_make_resp_headers(struct h2s *h2s, struct buffer *buf)
chunk_reset(&outbuf);
while (1) {
outbuf.str = bo_end(h2c->mbuf);
outbuf.str = b_tail(h2c->mbuf);
outbuf.size = bo_contig_space(h2c->mbuf);
outbuf.len = 0;
@ -3146,7 +3146,7 @@ static int h2s_frt_make_resp_data(struct h2s *h2s, struct buffer *buf)
chunk_reset(&outbuf);
while (1) {
outbuf.str = bo_end(h2c->mbuf);
outbuf.str = b_tail(h2c->mbuf);
outbuf.size = bo_contig_space(h2c->mbuf);
outbuf.len = 0;