mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-28 22:31:06 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: ist: Add int isttest(const struct ist)

Browse Source 
`isttest` returns whether the `.ptr` is non-null.
This commit is contained in:
Tim Duesterhus 2020-03-05 17:56:31 +01:00 committed by Willy Tarreau
parent 241e29ef9c
commit e296d3e5f0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/common/ist.h
View File

@ -186,6 +186,12 @@ static inline struct ist ist2(const void *ptr, size_t len)
return (struct ist){ .ptr = (char *)ptr, .len = len }; return (struct ist){ .ptr = (char *)ptr, .len = len };
} }
/* returns the result of `ist.ptr != NULL` */
static inline int isttest(const struct ist ist)
{
return ist.ptr != NULL;
}
/* This function MODIFIES the string to add a zero AFTER the end, and returns /* This function MODIFIES the string to add a zero AFTER the end, and returns
* the start pointer. The purpose is to use it on strings extracted by parsers * the start pointer. The purpose is to use it on strings extracted by parsers
* from larger strings cut with delimiters that are not important and can be * from larger strings cut with delimiters that are not important and can be

2
src/http_ana.c
View File

@ -2787,7 +2787,7 @@ int http_res_set_status(unsigned int status, struct ist reason, struct stream *s
trash.data = res - trash.area; trash.data = res - trash.area;
/* Do we have a custom reason format string? */ /* Do we have a custom reason format string? */
if (reason.ptr == NULL) { if (!isttest(reason)) {
const char *str = http_get_reason(status); const char *str = http_get_reason(status);
reason = ist2(str, strlen(str)); reason = ist2(str, strlen(str));
} }