move TfwStr_string to str.h and rename TfwStr_string to TFW_STR_STRING

Author: avbelov23

tempesta_fw/cache.c

@@ -47,15 +47,13 @@ static const int tfw_cache_spec_headers_304[] = {
 	[TFW_HTTP_HDR_ETAG] = 1,
 };
 static const TfwStr tfw_cache_raw_headers_304[] = {
-#define TfwStr_string(v)	{ .data = (v), NULL, sizeof(v) - 1, 0 }
-	TfwStr_string("cache-control:"),
-	TfwStr_string("content-location:"),
-	TfwStr_string("date:"),
-	TfwStr_string("expires:"),
-	TfwStr_string("last-modified:"),
-	TfwStr_string("vary:"),
+	TFW_STR_STRING("cache-control:"),
+	TFW_STR_STRING("content-location:"),
+	TFW_STR_STRING("date:"),
+	TFW_STR_STRING("expires:"),
+	TFW_STR_STRING("last-modified:"),
+	TFW_STR_STRING("vary:"),
 	/* Etag are Spec headers */
-#undef TfwStr_string
 };
 #define TFW_CACHE_304_SPEC_HDRS_NUM	1	/* ETag. */
 #define TFW_CACHE_304_HDRS_NUM						\

tempesta_fw/http_msg.c

@@ -259,15 +259,13 @@ static inline bool
 __hdr_is_singular(const TfwStr *hdr)
 {
 	static const TfwStr hdr_singular[] = {
-#define TfwStr_string(v) { .data = (v), NULL, sizeof(v) - 1, 0 }
-		TfwStr_string("authorization:"),
-		TfwStr_string("from:"),
-		TfwStr_string("if-unmodified-since:"),
-		TfwStr_string("location:"),
-		TfwStr_string("max-forwards:"),
-		TfwStr_string("proxy-authorization:"),
-		TfwStr_string("referer:"),
-#undef TfwStr_string
+		TFW_STR_STRING("authorization:"),
+		TFW_STR_STRING("from:"),
+		TFW_STR_STRING("if-unmodified-since:"),
+		TFW_STR_STRING("location:"),
+		TFW_STR_STRING("max-forwards:"),
+		TFW_STR_STRING("proxy-authorization:"),
+		TFW_STR_STRING("referer:"),
 	};
 
 	return tfw_http_msg_find_hdr(hdr, hdr_singular);

tempesta_fw/http_parser.c

@@ -644,25 +644,23 @@ __hbh_parser_add_data(TfwHttpMsg *hm, char *data, unsigned long len, bool last)
 	TfwStr *hdr, *append;
 	TfwHttpHbhHdrs *hbh = &hm->conn->parser.hbh_parser;
 	static const TfwStr block[] = {
-#define TfwStr_string(v) { .data = (v), NULL, sizeof(v) - 1, 0 }
 		/* End-to-end spec and raw headers */
-		TfwStr_string("age:"),
-		TfwStr_string("authorization:"),
-		TfwStr_string("cache-control:"),
-		TfwStr_string("connection:"),
-		TfwStr_string("content-length:"),
-		TfwStr_string("content-type:"),
-		TfwStr_string("cookie:"),
-		TfwStr_string("date:"),
-		TfwStr_string("etag:"),
-		TfwStr_string("expires:"),
-		TfwStr_string("host:"),
-		TfwStr_string("pragma:"),
-		TfwStr_string("server:"),
-		TfwStr_string("transfer-encoding:"),
-		TfwStr_string("user-agent:"),
-		TfwStr_string("x-forwarded-for:"),
-#undef TfwStr_string
+		TFW_STR_STRING("age:"),
+		TFW_STR_STRING("authorization:"),
+		TFW_STR_STRING("cache-control:"),
+		TFW_STR_STRING("connection:"),
+		TFW_STR_STRING("content-length:"),
+		TFW_STR_STRING("content-type:"),
+		TFW_STR_STRING("cookie:"),
+		TFW_STR_STRING("date:"),
+		TFW_STR_STRING("etag:"),
+		TFW_STR_STRING("expires:"),
+		TFW_STR_STRING("host:"),
+		TFW_STR_STRING("pragma:"),
+		TFW_STR_STRING("server:"),
+		TFW_STR_STRING("transfer-encoding:"),
+		TFW_STR_STRING("user-agent:"),
+		TFW_STR_STRING("x-forwarded-for:"),
 	};
 
 	if (hbh->off == TFW_HBH_TOKENS_MAX)

tempesta_fw/str.h

@@ -216,8 +216,9 @@ typedef struct tfwstr_t {
 	unsigned char	eolen;
 } TfwStr;
 
-#define DEFINE_TFW_STR(name, val)	TfwStr name =			\
-	{.data = (val), NULL, sizeof(val) - 1, 0, 0, 0}
+#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,	\
 						  NULL, strlen(s), 0, 0, 0})
 

tempesta_fw/t/unit/test_http_msg.c

@@ -25,49 +25,47 @@
 TEST(http_msg, hdr_in_array)
 {
 	size_t i;
-#define TfwStr_string(v)	{ .data = (v), NULL, sizeof(v) - 1, 0 }
 	static const TfwStr hdrs[] = {
-		TfwStr_string("age:"),
-		TfwStr_string("authorization:"),
-		TfwStr_string("cache-control:"),
-		TfwStr_string("connection:"),
-		TfwStr_string("content-length:"),
-		TfwStr_string("content-type:"),
-		TfwStr_string("cookie:"),
-		TfwStr_string("date:"),
-		TfwStr_string("etag:"),
-		TfwStr_string("expires:"),
-		TfwStr_string("from:"),
-		TfwStr_string("host:"),
-		TfwStr_string("if-unmodified-since:"),
-		TfwStr_string("last-modified:"),
-		TfwStr_string("location:"),
-		TfwStr_string("pragma:"),
-		TfwStr_string("proxy-authorization:"),
-		TfwStr_string("referer:"),
-		TfwStr_string("server:"),
-		TfwStr_string("transfer-encoding:"),
-		TfwStr_string("user-agent:"),
-		TfwStr_string("vary:"),
-		TfwStr_string("x-forwarded-for:"),
+		TFW_STR_STRING("age:"),
+		TFW_STR_STRING("authorization:"),
+		TFW_STR_STRING("cache-control:"),
+		TFW_STR_STRING("connection:"),
+		TFW_STR_STRING("content-length:"),
+		TFW_STR_STRING("content-type:"),
+		TFW_STR_STRING("cookie:"),
+		TFW_STR_STRING("date:"),
+		TFW_STR_STRING("etag:"),
+		TFW_STR_STRING("expires:"),
+		TFW_STR_STRING("from:"),
+		TFW_STR_STRING("host:"),
+		TFW_STR_STRING("if-unmodified-since:"),
+		TFW_STR_STRING("last-modified:"),
+		TFW_STR_STRING("location:"),
+		TFW_STR_STRING("pragma:"),
+		TFW_STR_STRING("proxy-authorization:"),
+		TFW_STR_STRING("referer:"),
+		TFW_STR_STRING("server:"),
+		TFW_STR_STRING("transfer-encoding:"),
+		TFW_STR_STRING("user-agent:"),
+		TFW_STR_STRING("vary:"),
+		TFW_STR_STRING("x-forwarded-for:"),
 	};
 	static const TfwStr o_hdrs[] = {
-		TfwStr_string("keep-alive:"),
-		TfwStr_string("max-forwards:"),
-		TfwStr_string("content-location:"),
+		TFW_STR_STRING("keep-alive:"),
+		TFW_STR_STRING("max-forwards:"),
+		TFW_STR_STRING("content-location:"),
 	};
 #define S_PART_01	"cache-control: no-cache"
 #define S_PART_02	"cache-control: no-store"
 	TfwStr dup_hdr = {
 		.chunks = (TfwStr []){
-			TfwStr_string(S_PART_01),
-			TfwStr_string(S_PART_01),
+			TFW_STR_STRING(S_PART_01),
+			TFW_STR_STRING(S_PART_01),
 		},
 		.len = SLEN(S_PART_01 S_PART_02),
 		.nchunks = 2,
 		.flags = TFW_STR_DUPLICATE,
 	};
-#undef TfwStr_string
 #undef S_PART_01
 #undef S_PART_02