rename TFW_STR_FROM to TFW_STR_FROM_CSTR

Author: avbelov23

tempesta_fw/http.c

@@ -2141,9 +2141,9 @@ tfw_http_recreate_content_type_multipart_hdr(TfwHttpReq *req)
 {
 	TfwStr replacement = {
 		.chunks = (TfwStr []) {
-			TFW_STR_FROM("Content-Type"),
-			TFW_STR_FROM(": "),
-			TFW_STR_FROM("multipart/form-data; boundary="),
+			TFW_STR_FROM_CSTR("Content-Type"),
+			TFW_STR_FROM_CSTR(": "),
+			TFW_STR_FROM_CSTR("multipart/form-data; boundary="),
 			req->multipart_boundary_raw,
 		},
 		.nchunks = 4,

tempesta_fw/http_parser.c

@@ -1448,7 +1448,7 @@ __req_parse_content_type(TfwHttpMsg *hm, unsigned char *data, size_t len)
 
 	__FSM_STATE(I_ContTypeMediaType) {
 		static const TfwStr s_multipart_form_data =
-			TFW_STR_FROM("multipart/form-data");
+			TFW_STR_FROM_CSTR("multipart/form-data");
 		TRY_STR_LAMBDA_fixup(&s_multipart_form_data, &parser->hdr, {},
 				     I_ContTypeMaybeMultipart);
 		if (chunk->len >= sizeof("multipart/") - 1) {
@@ -1497,7 +1497,7 @@ __req_parse_content_type(TfwHttpMsg *hm, unsigned char *data, size_t len)
 	}
 
 	__FSM_STATE(I_ContTypeParam) {
-		static const TfwStr s_boundary = TFW_STR_FROM("boundary=");
+		static const TfwStr s_boundary = TFW_STR_FROM_CSTR("boundary=");
 		if (!test_bit(TFW_HTTP_B_CT_MULTIPART, req->flags))
 			__FSM_I_JMP(I_ContTypeParamOther);
 

tempesta_fw/sock_clnt.c

@@ -480,7 +480,7 @@ tfw_cfgop_listen(TfwCfgSpec *cs, TfwCfgEntry *ce)
 		addr = tfw_addr_new_v4(INADDR_ANY, htons(port));
 
 	} else {
-		r = tfw_addr_pton(&TFW_STR_FROM(in_str), &addr);
+		r = tfw_addr_pton(&TFW_STR_FROM_CSTR(in_str), &addr);
 		if (r)
 			goto parse_err;
 	}

tempesta_fw/sock_srv.c

@@ -1323,7 +1323,7 @@ tfw_cfgop_server(TfwCfgSpec *cs, TfwCfgEntry *ce, TfwCfgSrvGroup *sg_cfg)
 		return -EINVAL;
 	}
 
-	if (tfw_addr_pton(&TFW_STR_FROM(ce->vals[0]), &addr)) {
+	if (tfw_addr_pton(&TFW_STR_FROM_CSTR(ce->vals[0]), &addr)) {
 		TFW_ERR_NL("Invalid IP address: '%s'\n", ce->vals[0]);
 		return -EINVAL;
 	}

tempesta_fw/str.h

@@ -219,7 +219,7 @@ typedef struct tfwstr_t {
 #define TFW_STR_STRING(val)		((TfwStr){.data = (val), NULL,	\
 						  sizeof(val) - 1, 0, 0, 0})
 #define DEFINE_TFW_STR(name, val)	TfwStr name = TFW_STR_STRING(val)
-#define TFW_STR_FROM(s)			((TfwStr){.data = (char*)s,	\
+#define TFW_STR_FROM_CSTR(s)		((TfwStr){.data = (char*)s,	\
 						  NULL, strlen(s), 0, 0, 0})
 
 /* Use this with "%.*s" in printing calls. */

tempesta_fw/t/bomber.c

@@ -460,7 +460,7 @@ tfw_bmb_init(void)
 	struct task_struct *task;
 	int r = 0;
 
-	if (tfw_addr_pton(&TFW_STR_FROM(server), &bmb_server_address)) {
+	if (tfw_addr_pton(&TFW_STR_FROM_CSTR(server), &bmb_server_address)) {
 		TFW_ERR("Unable to parse server's address: %s", server);
 		return -EINVAL;
 	}

tempesta_fw/t/unit/sched_helper.c

@@ -158,7 +158,7 @@ test_create_srv(const char *in_addr, TfwSrvGroup *sg)
 	TfwServer *srv;
 
 	{
-		int r = tfw_addr_pton(&TFW_STR_FROM(in_addr), &addr);
+		int r = tfw_addr_pton(&TFW_STR_FROM_CSTR(in_addr), &addr);
 		BUG_ON(r);
 	}
 

tempesta_fw/t/unit/test_tfw_str.c

@@ -1104,11 +1104,11 @@ TEST(tfw_str_collect_cmp, collect_chunks)
 {
 	TfwStr in = {
 		.chunks = (TfwStr []){
-			TFW_STR_FROM("abcd"),
-			TFW_STR_FROM("efghi"),
-			TFW_STR_FROM("jklmnopq"),
-			TFW_STR_FROM("rst"),
-			TFW_STR_FROM("uvwxyz")
+			TFW_STR_FROM_CSTR("abcd"),
+			TFW_STR_FROM_CSTR("efghi"),
+			TFW_STR_FROM_CSTR("jklmnopq"),
+			TFW_STR_FROM_CSTR("rst"),
+			TFW_STR_FROM_CSTR("uvwxyz")
 		},
 		.len = sizeof("abcdefghijklmnopqrstuvwxyz") - 1,
 		.nchunks = 5
@@ -1331,11 +1331,11 @@ TEST(tfw_str_del_chunk, first)
 {
 	TfwStr s = {
 		.chunks = (TfwStr []){
-			TFW_STR_FROM("abcd"),
-			TFW_STR_FROM("efghi"),
-			TFW_STR_FROM("jklmnopq"),
-			TFW_STR_FROM("rst"),
-			TFW_STR_FROM("uvwxyz")
+			TFW_STR_FROM_CSTR("abcd"),
+			TFW_STR_FROM_CSTR("efghi"),
+			TFW_STR_FROM_CSTR("jklmnopq"),
+			TFW_STR_FROM_CSTR("rst"),
+			TFW_STR_FROM_CSTR("uvwxyz")
 		},
 		.len = SLEN("abcdefghijklmnopqrstuvwxyz"),
 		.nchunks = 5
@@ -1351,11 +1351,11 @@ TEST(tfw_str_del_chunk, middle)
 {
 	TfwStr s = {
 		.chunks = (TfwStr []){
-			TFW_STR_FROM("abcd"),
-			TFW_STR_FROM("efghi"),
-			TFW_STR_FROM("jklmnopq"),
-			TFW_STR_FROM("rst"),
-			TFW_STR_FROM("uvwxyz")
+			TFW_STR_FROM_CSTR("abcd"),
+			TFW_STR_FROM_CSTR("efghi"),
+			TFW_STR_FROM_CSTR("jklmnopq"),
+			TFW_STR_FROM_CSTR("rst"),
+			TFW_STR_FROM_CSTR("uvwxyz")
 		},
 		.len = SLEN("abcdefghijklmnopqrstuvwxyz"),
 		.nchunks = 5
@@ -1371,11 +1371,11 @@ TEST(tfw_str_del_chunk, last)
 {
 	TfwStr s = {
 		.chunks = (TfwStr []){
-			TFW_STR_FROM("abcd"),
-			TFW_STR_FROM("efghi"),
-			TFW_STR_FROM("jklmnopq"),
-			TFW_STR_FROM("rst"),
-			TFW_STR_FROM("uvwxyz")
+			TFW_STR_FROM_CSTR("abcd"),
+			TFW_STR_FROM_CSTR("efghi"),
+			TFW_STR_FROM_CSTR("jklmnopq"),
+			TFW_STR_FROM_CSTR("rst"),
+			TFW_STR_FROM_CSTR("uvwxyz")
 		},
 		.len = SLEN("abcdefghijklmnopqrstuvwxyz"),
 		.nchunks = 5