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

[CLEANUP] acl, patterns: make use of my_strndup() instead of malloc+memcpy

Browse Source 
This is simpler and more readable.
This commit is contained in:
Willy Tarreau 2010-01-26 19:02:46 +01:00
parent 0c55931696
commit ac778f5ade
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/acl.c
View File

@ -668,11 +668,8 @@ struct acl_expr *parse_acl_expr(const char **args)
end = strchr(arg, ')');
if (!end)
goto out_free_expr;
arg2 = (char *)calloc(1, end - arg + 1);
if (!arg2)
arg2 = my_strndup(arg, end - arg);
goto out_free_expr;
memcpy(arg2, arg, end - arg);
arg2[end-arg] = '\0';
expr->arg_len = end - arg;
expr->arg.str = arg2;
}

4
src/pattern.c
View File

@ -397,9 +397,7 @@ struct pattern_expr *pattern_parse_expr(char **str, int *idx)
if (end != endw) {
expr->arg_len = end - endw - 2;
expr->arg = malloc(expr->arg_len + 1);
expr->arg = memcpy(expr->arg, endw + 1, expr->arg_len);
expr->arg[expr->arg_len] = '\0';
expr->arg = my_strndup(endw + 1, expr->arg_len);
}
for (*idx += 1; *(str[*idx]); (*idx)++) {