commit f4f6c0f6bb420d8449bd663ed71774c910d21552
author Tim Duesterhus <tim@bastelstu.be> Tue Mar 15 13:11:08 2022 +0100
committer Willy Tarreau <w@1wt.eu> Mon Mar 21 08:30:47 2022 +0100
tree d1dc1ac1ac1a18c8a266c83e0338406be8f0bb1d
parent 14abfb61fb1784bbea30ec135e5b24440ba92b47

CLEANUP: Reapply ist.cocci

This makes use of the newly added:

    - i.ptr = p;
    - i.len = strlen(i.ptr);
    + i = ist(p);

patch.

src/http_act.c

diff --git a/src/http_act.c b/src/http_act.c
index b7ec312..133a30c 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -697,8 +697,7 @@
 	if (*args[*orig_arg] && strcmp(args[*orig_arg], "reason") == 0 &&
 	    (*args[*orig_arg + 1] && strcmp(args[*orig_arg + 1], "if") != 0 && strcmp(args[*orig_arg + 1], "unless") != 0)) {
 		(*orig_arg)++;
-		rule->arg.http.str.ptr = strdup(args[*orig_arg]);
-		rule->arg.http.str.len = strlen(rule->arg.http.str.ptr);
+		rule->arg.http.str = ist(strdup(args[*orig_arg]));
 		(*orig_arg)++;
 	}
 
@@ -1325,8 +1324,7 @@
 			memprintf(err, "missing realm value.\n");
 			return ACT_RET_PRS_ERR;
 		}
-		rule->arg.http.str.ptr = strdup(args[cur_arg]);
-		rule->arg.http.str.len = strlen(rule->arg.http.str.ptr);
+		rule->arg.http.str = ist(strdup(args[cur_arg]));
 		cur_arg++;
 	}
 
@@ -1508,8 +1506,7 @@
 	}
 
 
-	rule->arg.http.str.ptr = strdup(args[cur_arg]);
-	rule->arg.http.str.len = strlen(rule->arg.http.str.ptr);
+	rule->arg.http.str = ist(strdup(args[cur_arg]));
 	LIST_INIT(&rule->arg.http.fmt);
 
 	if (rule->from == ACT_F_HTTP_REQ) {
@@ -1617,8 +1614,7 @@
 		return ACT_RET_PRS_ERR;
 	}
 
-	rule->arg.http.str.ptr = strdup(args[cur_arg]);
-	rule->arg.http.str.len = strlen(rule->arg.http.str.ptr);
+	rule->arg.http.str = ist(strdup(args[cur_arg]));
 	LIST_INIT(&rule->arg.http.fmt);
 
 	cur_arg++;
@@ -1721,8 +1717,7 @@
 		return ACT_RET_PRS_ERR;
 	}
 
-	rule->arg.http.str.ptr = strdup(args[cur_arg]);
-	rule->arg.http.str.len = strlen(rule->arg.http.str.ptr);
+	rule->arg.http.str = ist(strdup(args[cur_arg]));
 	px->conf.args.ctx = (rule->from == ACT_F_HTTP_REQ ? ARGC_HRQ : ARGC_HRS);
 
 	LIST_INIT(&rule->arg.http.fmt);