From: Willy Tarreau <w@1wt.eu>
Date: Sun, 19 Jul 2015 16:47:45 +0000 (+0200)
Subject: CLEANUP: stream-int: remove stream_int_unregister_handler() and si_detach()
X-Git-Tag: v1.6-dev3~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a08d3b2d727965a29d7096f54fa218d8f078131;p=thirdparty%2Fhaproxy.git

CLEANUP: stream-int: remove stream_int_unregister_handler() and si_detach()

The former was not used anymore and the latter was only used by the former.
They were only aliases to other existing functions anyway.
---

diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index 7f543242d3..0745d85e84 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -46,7 +46,6 @@ 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 applet *app);
-void stream_int_unregister_handler(struct stream_interface *si);
 void si_applet_done(struct stream_interface *si);
 
 /* returns the channel which receives data from this stream interface (input channel) */
@@ -154,11 +153,6 @@ static inline void si_release_endpoint(struct stream_interface *si)
 	si->ops = &si_embedded_ops;
 }
 
-static inline void si_detach(struct stream_interface *si)
-{
-	si_release_endpoint(si);
-}
-
 /* Turn a possibly existing connection endpoint of stream interface <si> to
  * idle mode, which means that the connection will be polled for incoming events
  * and might be killed by the underlying I/O handler.
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 97add687d7..4b8d924f6a 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -396,14 +396,6 @@ struct appctx *stream_int_register_handler(struct stream_interface *si, struct a
 	return si_appctx(si);
 }
 
-/* Unregister a stream interface handler. This must be called by the handler task
- * itself when it detects that it is in the SI_ST_DIS state.
- */
-void stream_int_unregister_handler(struct stream_interface *si)
-{
-	si_detach(si);
-}
-
 /* This callback is used to send a valid PROXY protocol line to a socket being
  * established. It returns 0 if it fails in a fatal way or needs to poll to go
  * further, otherwise it returns non-zero and removes itself from the connection's