From: Willy Tarreau Date: Tue, 2 Jun 2020 17:25:28 +0000 (+0200) Subject: REORG: include: split common/http-hdr.h into haproxy/http-hdr{,-t}.h X-Git-Tag: v2.2-dev9~99 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0017be014319ff71f6021e269a527869d1605b6b;p=thirdparty%2Fhaproxy.git 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. --- diff --git a/include/common/h1.h b/include/common/h1.h index 7c341fe931..879e041d07 100644 --- a/include/common/h1.h +++ b/include/common/h1.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include diff --git a/include/common/h2.h b/include/common/h2.h index 32f02060ae..42c3c5a01d 100644 --- a/include/common/h2.h +++ b/include/common/h2.h @@ -30,7 +30,7 @@ #define _COMMON_H2_H #include -#include +#include #include #include diff --git a/include/common/hpack-tbl.h b/include/common/hpack-tbl.h index 07e0a9fa30..b0ab4ff4fe 100644 --- a/include/common/hpack-tbl.h +++ b/include/common/hpack-tbl.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/include/common/htx.h b/include/common/htx.h index 3c3ac0bf3b..1b111a40e7 100644 --- a/include/common/htx.h +++ b/include/common/htx.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include /* * The internal representation of an HTTP message, called HTX, is a structure diff --git a/include/haproxy/http-hdr-t.h b/include/haproxy/http-hdr-t.h new file mode 100644 index 0000000000..3534f43a48 --- /dev/null +++ b/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 + * 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 + +/* 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 */ diff --git a/include/common/http-hdr.h b/include/haproxy/http-hdr.h similarity index 82% rename from include/common/http-hdr.h rename to include/haproxy/http-hdr.h index 77997e33e1..e9e253b528 100644 --- a/include/common/http-hdr.h +++ b/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 * 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 #include - -/* 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 /* sets an http_hdr to name and value . 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 */ diff --git a/src/h1.c b/src/h1.c index f30e4891f0..f143db9c3b 100644 --- a/src/h1.c +++ b/src/h1.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include diff --git a/src/h2.c b/src/h2.c index fa72e1c902..c59c3f2a50 100644 --- a/src/h2.c +++ b/src/h2.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/hpack-enc.c b/src/hpack-enc.c index bf7336b08f..21e28f6544 100644 --- a/src/hpack-enc.c +++ b/src/hpack-enc.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include