use TFW_STR_STRING instead TFW_STR_FROM_CSTR where possible

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_CSTR("Content-Type"),
-			TFW_STR_FROM_CSTR(": "),
-			TFW_STR_FROM_CSTR("multipart/form-data; boundary="),
+			TFW_STR_STRING("Content-Type"),
+			TFW_STR_STRING(": "),
+			TFW_STR_STRING("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_CSTR("multipart/form-data");
+			TFW_STR_STRING("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_CSTR("boundary=");
+		static const TfwStr s_boundary = TFW_STR_STRING("boundary=");
 		if (!test_bit(TFW_HTTP_B_CT_MULTIPART, req->flags))
 			__FSM_I_JMP(I_ContTypeParamOther);
 

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_CSTR("abcd"),
-			TFW_STR_FROM_CSTR("efghi"),
-			TFW_STR_FROM_CSTR("jklmnopq"),
-			TFW_STR_FROM_CSTR("rst"),
-			TFW_STR_FROM_CSTR("uvwxyz")
+			TFW_STR_STRING("abcd"),
+			TFW_STR_STRING("efghi"),
+			TFW_STR_STRING("jklmnopq"),
+			TFW_STR_STRING("rst"),
+			TFW_STR_STRING("uvwxyz")
 		},
 		.len = sizeof("abcdefghijklmnopqrstuvwxyz") - 1,
 		.nchunks = 5
@@ -1331,11 +1331,11 @@ TEST(tfw_str_del_chunk, first)
 {
 	TfwStr s = {
 		.chunks = (TfwStr []){
-			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")
+			TFW_STR_STRING("abcd"),
+			TFW_STR_STRING("efghi"),
+			TFW_STR_STRING("jklmnopq"),
+			TFW_STR_STRING("rst"),
+			TFW_STR_STRING("uvwxyz")
 		},
 		.len = SLEN("abcdefghijklmnopqrstuvwxyz"),
 		.nchunks = 5
@@ -1351,11 +1351,11 @@ TEST(tfw_str_del_chunk, middle)
 {
 	TfwStr s = {
 		.chunks = (TfwStr []){
-			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")
+			TFW_STR_STRING("abcd"),
+			TFW_STR_STRING("efghi"),
+			TFW_STR_STRING("jklmnopq"),
+			TFW_STR_STRING("rst"),
+			TFW_STR_STRING("uvwxyz")
 		},
 		.len = SLEN("abcdefghijklmnopqrstuvwxyz"),
 		.nchunks = 5
@@ -1371,11 +1371,11 @@ TEST(tfw_str_del_chunk, last)
 {
 	TfwStr s = {
 		.chunks = (TfwStr []){
-			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")
+			TFW_STR_STRING("abcd"),
+			TFW_STR_STRING("efghi"),
+			TFW_STR_STRING("jklmnopq"),
+			TFW_STR_STRING("rst"),
+			TFW_STR_STRING("uvwxyz")
 		},
 		.len = SLEN("abcdefghijklmnopqrstuvwxyz"),
 		.nchunks = 5