RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-05 01:07:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: standard: The parse_binary() returns the length consumed and his documentation is updated

Browse Source 
Actually the values returned by this function is never used. All the
callers just check if the resultat is non-zero. Before this patch, the
function returns the length of the produced content. This value is not
useful because is returned twice: the first time in the return value and
the second time in the <binstrlen> argument. Now the function returns
the number of bytes consumed from <source>.
This commit is contained in:
Thierry FOURNIER 2014-01-21 11:36:14 +01:00 committed by Willy Tarreau
parent e7ba23633b
commit ee330afba0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/standard.c
View File

@ -1360,7 +1360,7 @@ const char *parse_size_err(const char *text, unsigned *ret) {
* Parse binary string written in hexadecimal (source) and store the decoded * Parse binary string written in hexadecimal (source) and store the decoded
* result into binstr and set binstrlen to the lengh of binstr. Memory for * result into binstr and set binstrlen to the lengh of binstr. Memory for
* binstr is allocated by the function. In case of error, returns 0 with an * binstr is allocated by the function. In case of error, returns 0 with an
* error message in err. * error message in err. In succes case, it returns the consumed length.
*/ */
int parse_binary(const char *source, char **binstr, int *binstrlen, char **err) int parse_binary(const char *source, char **binstr, int *binstrlen, char **err)
{ {
@ -1403,7 +1403,7 @@ int parse_binary(const char *source, char **binstr, int *binstrlen, char **err)
goto bad_input; goto bad_input;
(*binstr)[j++] = (hex2i(p[i-2]) << 4) + hex2i(p[i-1]); (*binstr)[j++] = (hex2i(p[i-2]) << 4) + hex2i(p[i-1]);
} }
return len; return len << 1;
bad_input: bad_input:
memprintf(err, "an hex digit is expected (found '%c')", p[i-1]); memprintf(err, "an hex digit is expected (found '%c')", p[i-1]);