RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-04 20:46:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: buffer: make bo_putblk/bo_putstr/bo_putchk return the number of bytes copied.

Browse Source 
This is not used yet. Planned for LUA.
This commit is contained in:
Thierry FOURNIER 2015-02-06 18:40:20 +01:00 committed by Willy Tarreau
parent cc87a11842
commit 549aac8d0b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/common/buffer.h
View File

@ -354,9 +354,10 @@ static inline void bo_putchr(struct buffer *b, char c)
}
/* Tries to copy block <blk> into output data at buffer <b>. Supports wrapping.
* Data are truncated if buffer is too short.
* Data are truncated if buffer is too short. It returns the number of bytes
* copied.
*/
static inline void bo_putblk(struct buffer *b, const char *blk, int len)
static inline int bo_putblk(struct buffer *b, const char *blk, int len)
{
int cur_len = buffer_len(b);
int half;
@ -364,7 +365,7 @@ static inline void bo_putblk(struct buffer *b, const char *blk, int len)
if (len > b->size - cur_len)
len = (b->size - cur_len);
if (!len)
return;
return 0;
half = buffer_contig_space(b);
if (half > len)
@ -377,20 +378,23 @@ static inline void bo_putblk(struct buffer *b, const char *blk, int len)
b->p = b_ptr(b, half);
}
b->o += len;
return len;
}
/* Tries to copy string <str> into output data at buffer <b>. Supports wrapping.
* Data are truncated if buffer is too short.
* Data are truncated if buffer is too short. It returns the number of bytes
* copied.
*/
static inline void bo_putstr(struct buffer *b, const char *str)
static inline int bo_putstr(struct buffer *b, const char *str)
{
return bo_putblk(b, str, strlen(str));
}
/* Tries to copy chunk <chk> into output data at buffer <b>. Supports wrapping.
* Data are truncated if buffer is too short.
* Data are truncated if buffer is too short. It returns the number of bytes
* copied.
*/
static inline void bo_putchk(struct buffer *b, const struct chunk *chk)
static inline int bo_putchk(struct buffer *b, const struct chunk *chk)
{
return bo_putblk(b, chk->str, chk->len);
}