REORG: include: split common/http-hdr.h into haproxy/http-hdr{,-t}.h

There's only one struct and 2 inline functions. It could have been
merged into http.h but that would have added a massive dependency on
the hpack parts for nothing, so better keep it this way since hpack
is already freestanding and portable.

include/common/h1.h

@@ -26,7 +26,7 @@
 #include <haproxy/dynbuf.h>
 #include <haproxy/intops.h>
 #include <haproxy/http.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr-t.h>
 #include <import/ist.h>
 
 

include/common/h2.h

@@ -30,7 +30,7 @@
 #define _COMMON_H2_H
 
 #include <haproxy/api.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr-t.h>
 #include <common/htx.h>
 #include <import/ist.h>
 

include/common/hpack-tbl.h

@@ -29,7 +29,7 @@
 
 #include <stdlib.h>
 #include <haproxy/api.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr-t.h>
 #include <import/ist.h>
 #include <haproxy/pool.h>
 

include/common/htx.h

@@ -28,7 +28,7 @@
 #include <import/ist.h>
 #include <haproxy/chunk.h>
 #include <haproxy/http-t.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr-t.h>
 
 /*
  * The internal representation of an HTTP message, called HTX, is a structure

include/haproxy/http-hdr-t.h

@@ -0,0 +1,41 @@
+/*
+ * include/haproxy/http-hdr-t.h
+ * HTTP header management (new model) - type definitions
+ *
+ * Copyright (C) 2014-2020 Willy Tarreau <willy@haproxy.org>
+ * Copyright (C) 2017 HAProxy Technologies
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef _HAPROXY_HTTP_HDR_T_H
+#define _HAPROXY_HTTP_HDR_T_H
+
+#include <import/ist.h>
+
+/* a header field made of a name and a value. Such structure stores 4 longs so
+ * it takes 16 bytes on 32-bit systems and 32 bytes on 64-bit systems.
+ */
+struct http_hdr {
+	struct ist n; /* name */
+	struct ist v; /* value */
+};
+
+#endif /* _HAPROXY_HTTP_HDR_T_H */

include/haproxy/http-hdr.h

@@ -1,5 +1,6 @@
 /*
- * HTTP header management (new model) - type definitions
+ * include/haproxy/http-hdr.h
+ * HTTP header management (new model) - functions
  *
  * Copyright (C) 2014-2017 Willy Tarreau <willy@haproxy.org>
  * Copyright (C) 2017 HAProxy Technologies
@@ -24,19 +25,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef _COMMON_HTTP_HDR_H
-#define _COMMON_HTTP_HDR_H
+#ifndef _HAPROXY_HTTP_HDR_H
+#define _HAPROXY_HTTP_HDR_H
 
-#include <inttypes.h>
 #include <import/ist.h>
-
-/* a header field made of a name and a value. Such structure stores 4 longs so
- * it takes 16 bytes on 32-bit systems and 32 bytes on 64-bit systems.
- */
-struct http_hdr {
-	struct ist n; /* name */
-	struct ist v; /* value */
-};
+#include <haproxy/http-hdr-t.h>
 
 /* sets an http_hdr <hdr> to name <n> and value <v>. Useful to avoid casts in
  * immediate assignments.
@@ -64,4 +57,4 @@ static inline int http_del_hdr(struct http_hdr *hdr, const struct ist n)
 
 	return dst;
 }
-#endif /* _COMMON_HTTP_HDR_H */
+#endif /* _HAPROXY_HTTP_HDR_H */

src/h1.c

@@ -13,7 +13,7 @@
 #include <ctype.h>
 #include <haproxy/api.h>
 #include <common/h1.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr.h>
 
 #include <proto/channel.h>
 

src/h2.c

@@ -29,7 +29,7 @@
 #include <haproxy/api.h>
 #include <haproxy/http.h>
 #include <common/h2.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr-t.h>
 #include <import/ist.h>
 #include <types/global.h>
 

src/hpack-enc.c

@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include <common/hpack-enc.h>
-#include <common/http-hdr.h>
+#include <haproxy/http-hdr-t.h>
 #include <import/ist.h>
 
 #include <types/global.h>