mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-02-05 01:11:51 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: Use isttest(const struct ist) whenever possible

Browse Source 
Refactoring performed with the following Coccinelle patch:

    @@
    struct ist i;
    @@

    - i.ptr != NULL
    + isttest(i)
This commit is contained in:
Tim Duesterhus 2021-03-02 18:57:28 +01:00 committed by Willy Tarreau
parent 154374cbc8
commit 7b5777d9b4
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend.c
View File

@ -721,7 +721,7 @@ int assign_server(struct stream *s)
uri = htx_sl_req_uri(http_get_stline(htxbuf(&s->req.buf)));
if (s->be->lbprm.arg_opt1 & 2) {
uri = http_get_path(uri);
if (!uri.ptr)
if (!isttest(uri))
uri = ist("");
}
srv = get_server_uh(s->be, uri.ptr, uri.len, prev_srv);

2
src/hpack-dec.c
View File

@ -118,7 +118,7 @@ static inline struct ist hpack_alloc_string(struct buffer *store, uint32_t idx,
out.len = in.len;
out.ptr = chunk_newstr(store);
if (unlikely(!out.ptr))
if (unlikely(!isttest(out)))
return out;
if (unlikely(store->data + out.len > store->size)) {

2
src/log.c
View File

@ -3562,7 +3562,7 @@ void parse_log_message(char *buf, size_t buflen, int *level, int *facility,
metadata[LOG_META_TAG].len = p - metadata[LOG_META_TAG].ptr;
metadata[LOG_META_PID].ptr = p + 1;
}
else if (*p == ']' && metadata[LOG_META_PID].ptr) {
else if (*p == ']' && isttest(metadata[LOG_META_PID])) {
if (p[1] != ':')
return;
metadata[LOG_META_PID].len = p - metadata[LOG_META_PID].ptr;

2
src/mux_h1.c
View File

@ -3586,7 +3586,7 @@ static int add_hdr_case_adjust(const char *from, const char *to, char **err)
entry->node.key = strdup(from);
entry->name = ist2(strdup(to), strlen(to));
if (!entry->node.key || !entry->name.ptr) {
if (!entry->node.key || !isttest(entry->name)) {
free(entry->node.key);
istfree(&entry->name);
free(entry);

2
src/mux_h2.c
View File

@ -5462,7 +5462,7 @@ static size_t h2s_bck_make_req_headers(struct h2s *h2s, struct htx *htx)
* is present, otherwise it must be deleted.
*/
v = istist(v, ist("trailers"));
if (!v.ptr || (v.len > 8 && v.ptr[8] != ','))
if (!isttest(v) || (v.len > 8 && v.ptr[8] != ','))
continue;
v = ist("trailers");
}

2
src/trace.c
View File

@ -200,7 +200,7 @@ void __trace(enum trace_level level, uint64_t mask, struct trace_source *src,
words++;
line[words++] = ist("] ");
if (ist_func.ptr) {
if (isttest(ist_func)) {
line[words++] = ist_func;
line[words++] = ist("(): ");
}