RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-30 10:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: buffer: remove the check for output on b_del()

Browse Source 
b_del() is used in :
  - mux_h2 with the demux buffer : always processes input data
  - checks with output data though output is not considered at all there
  - b_eat() which is not used anywhere
  - co_skip() where the len is always <= output

Thus the distinction for output data is not needed anymore and the
decrement can be made inconditionally in co_skip().
This commit is contained in:
Willy Tarreau 2018-07-09 11:39:49 +02:00
parent d54a8ceb97
commit abed1e7f34
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/common/buf.h
View File

@ -396,10 +396,6 @@ static inline void b_set_data(struct buffer *b, size_t len)
*/
static inline void b_del(struct buffer *b, size_t del)
{
if (del >= b->output)
b->output = 0;
else
b->output -= del;
b->len -= del;
b->head += del;
if (b->head >= b->size)

1
include/proto/channel.h
View File

@ -767,6 +767,7 @@ static inline void channel_slow_realign(struct channel *chn, char *swap)
static inline void co_skip(struct channel *chn, int len)
{
b_del(chn->buf, len);
chn->buf->output -= len;
c_realign_if_empty(chn);
/* notify that some data was written to the SI from the buffer */