]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
REORG: include: move common/fcgi.h to haproxy/
authorWilly Tarreau <w@1wt.eu>
Wed, 3 Jun 2020 12:56:08 +0000 (14:56 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 11 Jun 2020 08:18:57 +0000 (10:18 +0200)
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.

include/haproxy/fcgi.h [moved from include/common/fcgi.h with 96% similarity]
include/types/fcgi-app.h
src/fcgi.c
src/mux_fcgi.c

similarity index 96%
rename from include/common/fcgi.h
rename to include/haproxy/fcgi.h
index 43174f0959396362ad7430b233bfe1d52efcaaf2..e276d69c38a392c4d3c578cf80aa011f2d09b7a2 100644 (file)
@@ -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>
  * 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:
index 72219e9427bce2978c932223b73c11d72db4efac..c82f39a3862b70a93b66cd1ba5de7aa13c34cbbc 100644 (file)
@@ -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>
 
index 8cfb6d0a551445c7a8481bfc1b0320321280877d..455cc2228c4c86060d5ecd9db07f7e416920c034 100644 (file)
@@ -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>
 
index aa6c018dfda39f9a5a6f99364e8e221702e46123..0e1d59ce6024854c1ef071189b3c5dbf5435f8ba 100644 (file)
@@ -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>