mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: buffer: remove bi_ptr()

Browse Source 
It's now been replaced by b_head() when b->o is null, ci_head() when
the channel is known, or b_peek(b, b->o) in other situations.
This commit is contained in:
Willy Tarreau 2018-06-07 18:08:04 +02:00
parent 7194d3cc3b
commit dda2e41881
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/common/buffer.h
View File

@ -105,12 +105,6 @@ static inline void bo_del(struct buffer *b, unsigned int del)
b->o -= del;
}
/* Returns the start of the input data in a buffer */
static inline char *bi_ptr(const struct buffer *b)
{
return b->p;
}
/* Returns the end of the input data in a buffer (pointer to next
* insertion point).
*/

2
src/cache.c
View File

@ -224,7 +224,7 @@ cache_store_http_forward_data(struct stream *s, struct filter *filter,
c_adv(msg->chn, st->hdrs_len);
ret = shctx_row_data_append(shctx,
st->first_block,
(unsigned char *)bi_ptr(msg->chn->buf),
(unsigned char *)ci_head(msg->chn),
MIN(ci_contig_data(msg->chn), len - st->hdrs_len));
/* Rewind the buffer to forward all data */
c_rew(msg->chn, st->hdrs_len);

6
src/flt_http_comp.c
View File

@ -207,7 +207,7 @@ comp_http_data(struct stream *s, struct filter *filter, struct http_msg *msg)
c_adv(chn, *nxt);
block = ci_contig_data(chn);
memcpy(bi_end(tmpbuf), bi_ptr(buf), block);
memcpy(bi_end(tmpbuf), ci_head(chn), block);
if (len > block)
memcpy(bi_end(tmpbuf)+block, buf->data, len-block);
c_rew(chn, *nxt);
@ -649,7 +649,7 @@ http_compression_buffer_add_data(struct comp_state *st, struct buffer *in,
block2 = data_process_len - block1;
/* compressors return < 0 upon error or the amount of bytes read */
consumed_data = st->comp_algo->add_data(st->comp_ctx, bi_ptr(in), block1, out);
consumed_data = st->comp_algo->add_data(st->comp_ctx, b_peek(in, in->o), block1, out);
if (consumed_data != block1 || !block2)
goto end;
consumed_data = st->comp_algo->add_data(st->comp_ctx, in->data, block2, out);
@ -766,7 +766,7 @@ http_compression_buffer_end(struct comp_state *st, struct stream *s,
c_adv(chn, st->consumed);
if (ib->i > 0) {
left = ci_contig_data(chn);
memcpy(ob->p + ob->i, bi_ptr(ib), left);
memcpy(ob->p + ob->i, ci_head(chn), left);
ob->i += left;
if (ib->i - left) {
memcpy(ob->p + ob->i, ib->data, ib->i - left);

2
src/mux_h2.c
View File

@ -2780,7 +2780,7 @@ static int h2_frt_transfer_data(struct h2s *h2s, struct buffer *buf, int count)
if (h2c->dbuf->i < 1)
return 0;
h2c->dpl = *(uint8_t *)bi_ptr(h2c->dbuf);
h2c->dpl = *(uint8_t *)b_head(h2c->dbuf);
if (h2c->dpl >= h2c->dfl) {
/* RFC7540#6.1 : pad length = length of frame payload or greater */
h2c_error(h2c, H2_ERR_PROTOCOL_ERROR);