From: Willy Tarreau <w@1wt.eu>
Date: Wed, 3 Jun 2020 12:56:08 +0000 (+0200)
Subject: REORG: include: move common/fcgi.h to haproxy/
X-Git-Tag: v2.2-dev9~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa2ef5b5eb87d40c63558ec01b86c93af3878e77;p=thirdparty%2Fhaproxy.git

REORG: include: move common/fcgi.h to haproxy/

The file was moved almost verbatim (only stdio.h was dropped as useless).
It was not split between types and functions because it's only included
from direct C code (fcgi.c and mux_fcgi.c) as well as fcgi_app.h, included
from the same ones, which should also be remerged as a single one.
---

diff --git a/include/common/fcgi.h b/include/haproxy/fcgi.h
similarity index 96%
rename from include/common/fcgi.h
rename to include/haproxy/fcgi.h
index 43174f0959..e276d69c38 100644
--- a/include/common/fcgi.h
+++ b/include/haproxy/fcgi.h
@@ -1,5 +1,5 @@
 /*
- * include/common/fcgi.h
+ * include/haproxy/fcgi.h
  * This file contains FastCGI protocol definitions.
  *
  * Copyright (C) 2019 HAProxy Technologies, Christopher Faulet <cfaulet@haproxy.com>
@@ -19,13 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _COMMON_FCGI_H
-#define _COMMON_FCGI_H
+#ifndef _HAPROXY_FCGI_H
+#define _HAPROXY_FCGI_H
 
-#include <stdio.h>
+#include <import/ist.h>
 #include <haproxy/api.h>
 #include <haproxy/buf-t.h>
-#include <import/ist.h>
 
 /* FCGI protocol version */
 #define FCGI_VERSION    0x1
@@ -90,7 +89,7 @@ struct fcgi_end_request {
 };
 
 struct fcgi_unknown_type {
-    uint8_t type;
+	uint8_t type;
 };
 
 
@@ -124,7 +123,7 @@ size_t fcgi_aligned_decode_param(const struct buffer *in, size_t o, struct fcgi_
 
 size_t fcgi_decode_end_request(const struct buffer *in, size_t o, struct fcgi_end_request *r);
 
-#endif /* _COMMON_FCGI_H */
+#endif /* _HAPROXY_FCGI_H */
 
 /*
  * Local variables:
diff --git a/include/types/fcgi-app.h b/include/types/fcgi-app.h
index 72219e9427..c82f39a386 100644
--- a/include/types/fcgi-app.h
+++ b/include/types/fcgi-app.h
@@ -24,7 +24,7 @@
 
 #include <haproxy/api-t.h>
 #include <import/ist.h>
-#include <common/fcgi.h>
+#include <haproxy/fcgi.h>
 #include <haproxy/list-t.h>
 #include <haproxy/regex-t.h>
 
diff --git a/src/fcgi.c b/src/fcgi.c
index 8cfb6d0a55..455cc2228c 100644
--- a/src/fcgi.c
+++ b/src/fcgi.c
@@ -24,7 +24,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <common/fcgi.h>
+#include <haproxy/fcgi.h>
 #include <haproxy/buf.h>
 #include <haproxy/istbuf.h>
 
diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index aa6c018dfd..0e1d59ce60 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -12,7 +12,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/fcgi.h>
+#include <haproxy/fcgi.h>
 #include <haproxy/h1.h>
 #include <haproxy/htx.h>
 #include <import/ist.h>