CLEANUP: applet: rename struct si_applet to applet
Since this one does not depend on stream_interface anymore, remove the
"si_" prefix.
diff --git a/include/proto/applet.h b/include/proto/applet.h
index 61bca02..fd458d4 100644
--- a/include/proto/applet.h
+++ b/include/proto/applet.h
@@ -42,7 +42,7 @@
* pool_free2(connection) or appctx_free(), since it's allocated from the
* connection pool. <applet> is assigned as the applet, but it can be NULL.
*/
-static inline struct appctx *appctx_new(struct si_applet *applet)
+static inline struct appctx *appctx_new(struct applet *applet)
{
struct appctx *appctx;
diff --git a/include/proto/dumpstats.h b/include/proto/dumpstats.h
index cbbb802..2bdc3b1 100644
--- a/include/proto/dumpstats.h
+++ b/include/proto/dumpstats.h
@@ -54,7 +54,7 @@
#define STAT_SCOPE_INPUT_NAME "scope" /* pattern form scope name <input> in html form */
#define STAT_SCOPE_PATTERN "?" STAT_SCOPE_INPUT_NAME "="
-extern struct si_applet http_stats_applet;
+extern struct applet http_stats_applet;
void stats_io_handler(struct stream_interface *si);
diff --git a/include/proto/obj_type.h b/include/proto/obj_type.h
index 6d6577c..b64244f 100644
--- a/include/proto/obj_type.h
+++ b/include/proto/obj_type.h
@@ -95,12 +95,12 @@
return __objt_server(t);
}
-static inline struct si_applet *__objt_applet(enum obj_type *t)
+static inline struct applet *__objt_applet(enum obj_type *t)
{
- return container_of(t, struct si_applet, obj_type);
+ return container_of(t, struct applet, obj_type);
}
-static inline struct si_applet *objt_applet(enum obj_type *t)
+static inline struct applet *objt_applet(enum obj_type *t)
{
if (!t || *t != OBJ_TYPE_APPLET)
return NULL;
diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index 2645961..036a4e1 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -44,7 +44,7 @@
extern struct data_cb si_conn_cb;
extern struct data_cb si_idle_conn_cb;
-struct appctx *stream_int_register_handler(struct stream_interface *si, struct si_applet *app);
+struct appctx *stream_int_register_handler(struct stream_interface *si, struct applet *app);
void stream_int_unregister_handler(struct stream_interface *si);
/* returns the channel which receives data from this stream interface (input channel) */
@@ -274,7 +274,7 @@
* and returned. NULL may be returned upon memory shortage. Applet <applet>
* is assigned to the appctx, but it may be NULL.
*/
-static inline struct appctx *si_alloc_appctx(struct stream_interface *si, struct si_applet *applet)
+static inline struct appctx *si_alloc_appctx(struct stream_interface *si, struct applet *applet)
{
struct appctx *appctx;