upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-15 21:59:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

BUG/MINOR: samples: fix unnecessary memcopy converting binary to string.

Browse source
This commit is contained in:
Emeric Brun 2014-11-03 18:17:10 +01:00 committed by Willy Tarreau
parent 42fb809cf4
commit 4b9e80268e
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/sample.c
View file

@ -499,27 +499,20 @@ static int c_str2ipv6(struct sample *smp)
return 1;
}
/* The sample is always copied into a new one so that smp->size is always
* valid. The NULL char always enforces the end of string if it is met.
/*
* The NULL char always enforces the end of string if it is met.
* Data is never changed, so we can ignore the CONST case
*/
static int c_bin2str(struct sample *smp)
{
struct chunk *trash = get_trash_chunk();
unsigned char c;
int ptr = 0;
int i;
while (ptr < smp->data.str.len) {
c = smp->data.str.str[ptr];
if (!c)
for (i = 0; i < smp->data.str.len; i++) {
if (!smp->data.str.str[i]) {
smp->data.str.len = i;
break;
trash->str[ptr] = c;
ptr++;
}
}
trash->len = ptr;
trash->str[ptr] = 0;
smp->data.str = *trash;
smp->type = SMP_T_STR;
smp->flags &= ~SMP_F_CONST;
return 1;
}