commit 7b5777d9b4db67815730cbc36d70164892dccfd6
author Tim Duesterhus <tim@bastelstu.be> Tue Mar 02 18:57:28 2021 +0100
committer Willy Tarreau <w@1wt.eu> Wed Mar 03 05:07:10 2021 +0100
tree da4941887f8d3fa280b8d981eca15d22e7c6e832
parent 154374cbc826add921884fa3ec25da517c562e71

CLEANUP: Use isttest(const struct ist) whenever possible

Refactoring performed with the following Coccinelle patch:

    @@
    struct ist i;
    @@

    - i.ptr != NULL
    + isttest(i)

src/backend.c

diff --git a/src/backend.c b/src/backend.c
index 3cf8b27..e261679 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -721,7 +721,7 @@
 					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);

src/hpack-dec.c

diff --git a/src/hpack-dec.c b/src/hpack-dec.c
index debd611..4fa9bfd 100644
--- a/src/hpack-dec.c
+++ b/src/hpack-dec.c
@@ -118,7 +118,7 @@
 
 	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)) {

src/log.c

diff --git a/src/log.c b/src/log.c
index a7ffd9c..2bf7f15 100644
--- a/src/log.c
+++ b/src/log.c
@@ -3562,7 +3562,7 @@
 				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;

src/mux_h1.c

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 0ee4772..17ce315 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -3586,7 +3586,7 @@
 
 	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);

src/mux_h2.c

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 46940b4..b406c8a 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -5462,7 +5462,7 @@
 			 * 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");
 		}

src/trace.c

diff --git a/src/trace.c b/src/trace.c
index f72002d..85eb2cf 100644
--- a/src/trace.c
+++ b/src/trace.c
@@ -200,7 +200,7 @@
 	words++;
 	line[words++] = ist("] ");
 
-	if (ist_func.ptr) {
+	if (isttest(ist_func)) {
 		line[words++] = ist_func;
 		line[words++] = ist("(): ");
 	}