CLEANUP: Use the ist() macro whenever possible
Refactoring performed with the following Coccinelle patch:
@@
char *s;
@@
(
- ist2(s, strlen(s))
+ ist(s)
|
- ist2(strdup(s), strlen(s))
+ ist(strdup(s))
)
Note that this replacement is safe even in the strdup() case, because `ist()`
will not call `strlen()` on a `NULL` pointer. Instead is inserts a length of
`0`, effectively resulting in `IST_NULL`.
diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index ef9df24..0fe3d10 100644
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -2273,7 +2273,7 @@
memprintf(errmsg, "'%s' expects a MUX protocol as argument.", args[cur_arg]);
goto error;
}
- mux_proto = get_mux_proto(ist2(args[cur_arg+1], strlen(args[cur_arg+1])));
+ mux_proto = get_mux_proto(ist(args[cur_arg + 1]));
if (!mux_proto) {
memprintf(errmsg, "'%s' : unknown MUX protocol '%s'.", args[cur_arg], args[cur_arg+1]);
goto error;
@@ -2439,7 +2439,7 @@
switch (chk->send.type) {
case TCPCHK_SEND_STRING:
- chk->send.data = ist2(strdup(data), strlen(data));
+ chk->send.data = ist(strdup(data));
if (!isttest(chk->send.data)) {
memprintf(errmsg, "out of memory");
goto error;
@@ -2535,8 +2535,8 @@
strcasecmp(args[cur_arg+1], "transfer-encoding") == 0)
goto skip_hdr;
- hdrs[i].n = ist2(args[cur_arg+1], strlen(args[cur_arg+1]));
- hdrs[i].v = ist2(args[cur_arg+2], strlen(args[cur_arg+2]));
+ hdrs[i].n = ist(args[cur_arg + 1]);
+ hdrs[i].v = ist(args[cur_arg + 2]);
i++;
skip_hdr:
cur_arg += 2;
@@ -2605,7 +2605,7 @@
}
}
else {
- chk->send.http.uri = ist2(strdup(uri), strlen(uri));
+ chk->send.http.uri = ist(strdup(uri));
if (!isttest(chk->send.http.uri)) {
memprintf(errmsg, "out of memory");
goto error;
@@ -2613,7 +2613,7 @@
}
}
if (vsn) {
- chk->send.http.vsn = ist2(strdup(vsn), strlen(vsn));
+ chk->send.http.vsn = ist(strdup(vsn));
if (!isttest(chk->send.http.vsn)) {
memprintf(errmsg, "out of memory");
goto error;
@@ -2649,7 +2649,7 @@
}
}
else {
- chk->send.http.body = ist2(strdup(body), strlen(body));
+ chk->send.http.body = ist(strdup(body));
if (!isttest(chk->send.http.body)) {
memprintf(errmsg, "out of memory");
goto error;
@@ -3174,7 +3174,7 @@
}
case TCPCHK_EXPECT_STRING:
case TCPCHK_EXPECT_HTTP_BODY:
- chk->expect.data = ist2(strdup(pattern), strlen(pattern));
+ chk->expect.data = ist(strdup(pattern));
if (!isttest(chk->expect.data)) {
memprintf(errmsg, "out of memory");
goto error;
@@ -3229,7 +3229,7 @@
}
}
else {
- chk->expect.hdr.name = ist2(strdup(npat), strlen(npat));
+ chk->expect.hdr.name = ist(strdup(npat));
if (!isttest(chk->expect.hdr.name)) {
memprintf(errmsg, "out of memory");
goto error;
@@ -3259,7 +3259,7 @@
}
}
else {
- chk->expect.hdr.value = ist2(strdup(vpat), strlen(vpat));
+ chk->expect.hdr.value = ist(strdup(vpat));
if (!isttest(chk->expect.hdr.value)) {
memprintf(errmsg, "out of memory");
goto error;
@@ -3621,7 +3621,7 @@
expect->ok_status = HCHK_STATUS_L7OKD;
expect->err_status = HCHK_STATUS_L7RSP;
expect->tout_status = HCHK_STATUS_L7TOUT;
- expect->data = ist2(strdup(str), strlen(str));
+ expect->data = ist(strdup(str));
if (!isttest(expect->data)) {
pool_free(pool_head_tcpcheck_rule, tcpcheck);
return 0;
@@ -4766,14 +4766,14 @@
}
}
if (uri) {
- chk->send.http.uri = ist2(strdup(uri), strlen(uri));
+ chk->send.http.uri = ist(strdup(uri));
if (!isttest(chk->send.http.uri)) {
memprintf(errmsg, "out of memory");
goto error;
}
}
if (vsn) {
- chk->send.http.vsn = ist2(strdup(vsn), strlen(vsn));
+ chk->send.http.vsn = ist(strdup(vsn));
if (!isttest(chk->send.http.vsn)) {
memprintf(errmsg, "out of memory");
goto error;
@@ -4820,7 +4820,7 @@
/* Copy the body */
if (body) {
- chk->send.http.body = ist2(strdup(body), strlen(body));
+ chk->send.http.body = ist(strdup(body));
if (!isttest(chk->send.http.body)) {
memprintf(errmsg, "out of memory");
goto error;