CLEANUP: cache: don't export http_cache_applet anymore

This one can become static since it's not used by http/htx anymore.

diff --git a/include/types/cache.h b/include/types/cache.h
deleted file mode 100644 (file)
index 3c43006..0000000
--- a/include/types/cache.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _TYPES_CACHE_H
-#define _TYPES_CACHE_H
-
-struct applet http_cache_applet;
-
-#endif /*_TYPES_CACHE_H */
-
-

diff --git a/src/cache.c b/src/cache.c
index a24c2847477359930b188999f2e4f2a25063b16b..879e068c54c24ba41deaf01d2d742b95f1e39a97 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -48,7 +48,7 @@
 
 const char *cache_store_flt_id = "cache store filter";
 
-struct applet http_cache_applet;
+static struct applet http_cache_applet;
 
 struct flt_ops cache_ops;
 
@@ -1839,7 +1839,7 @@ static struct action_kw_list http_req_actions = {
 
 INITCALL1(STG_REGISTER, http_req_keywords_register, &http_req_actions);
 
-struct applet http_cache_applet = {
+static struct applet http_cache_applet = {
        .obj_type = OBJ_TYPE_APPLET,
        .name = "<CACHE>", /* used for logging */
        .fct = http_cache_io_handler,

diff --git a/src/proto_http.c b/src/proto_http.c
index 6373966977b42aad4bf5b93e2d48d4232fd2ea27..85e007b496310a7f1dba68b3e25b5fe8678fa748 100644 (file)
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -42,7 +42,6 @@
 #include <types/cli.h>
 #include <types/filters.h>
 #include <types/global.h>
-#include <types/cache.h>
 #include <types/stats.h>
 
 #include <proto/acl.h>

diff --git a/src/proto_htx.c b/src/proto_htx.c
index 9e0a135641957ab6510cb19015cbedd303b3c371..80d7fa15c38d8ea4d583abc87d6d297c38b7db09 100644 (file)
--- a/src/proto_htx.c
+++ b/src/proto_htx.c
@@ -16,7 +16,6 @@
 #include <common/htx.h>
 #include <common/uri_auth.h>
 
-#include <types/cache.h>
 #include <types/capture.h>
 
 #include <proto/acl.h>