summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorKinsey Moore <kmoore@digium.com>2013-08-17 14:39:27 +0000
committerKinsey Moore <kmoore@digium.com>2013-08-17 14:39:27 +0000
commit59753b1ea10a83ea770c35b24cd443620913349c (patch)
treec5fd1c815cd9f51e0083703845f4d69a2fbd4250 /channels
parent35b9c6a660236e23e6b9102cc641ab11e967a25a (diff)
Strip down the old event system
This removes unused code, event types, IE pltypes, and event IE types where possible and makes several functions private that were once public. This includes a renumbering of the remaining event and IE types which breaks binary compatibility with previous versions. The last remaining consumers of the old event system (or parts thereof) are main/security_events.c, res/res_security_log.c, tests/test_cel.c, tests/test_event.c, main/cel.c, and the CEL backends. Review: https://reviewboard.asterisk.org/r/2703/ (closes issue ASTERISK-22139) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396887 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_dahdi.c1
-rw-r--r--channels/chan_iax2.c1
-rw-r--r--channels/chan_mgcp.c1
-rw-r--r--channels/chan_sip.c1
-rw-r--r--channels/chan_skinny.c1
-rw-r--r--channels/chan_unistim.c1
-rw-r--r--channels/sig_pri.c6
-rw-r--r--channels/sig_pri.h1
8 files changed, 4 insertions, 9 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index b694ecf94..f2af6d918 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -119,7 +119,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/abstract_jb.h"
#include "asterisk/smdi.h"
#include "asterisk/astobj.h"
-#include "asterisk/event.h"
#include "asterisk/devicestate.h"
#include "asterisk/paths.h"
#include "asterisk/ccss.h"
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 786b4617b..1b910a14a 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -105,7 +105,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/netsock.h"
#include "asterisk/stringfields.h"
#include "asterisk/linkedlists.h"
-#include "asterisk/event.h"
#include "asterisk/astobj2.h"
#include "asterisk/timing.h"
#include "asterisk/taskprocessor.h"
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 07d8434cb..0bb102b63 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -79,7 +79,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/devicestate.h"
#include "asterisk/stringfields.h"
#include "asterisk/abstract_jb.h"
-#include "asterisk/event.h"
#include "asterisk/chanvars.h"
#include "asterisk/pktccops.h"
#include "asterisk/stasis.h"
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 79e821175..36291d1ac 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -276,7 +276,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/threadstorage.h"
#include "asterisk/translate.h"
#include "asterisk/ast_version.h"
-#include "asterisk/event.h"
#include "asterisk/data.h"
#include "asterisk/aoc.h"
#include "asterisk/message.h"
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 35da7bf8a..78e34450f 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -77,7 +77,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/abstract_jb.h"
#include "asterisk/threadstorage.h"
#include "asterisk/devicestate.h"
-#include "asterisk/event.h"
#include "asterisk/indications.h"
#include "asterisk/linkedlists.h"
#include "asterisk/stasis_endpoints.h"
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index e712d7684..adb5cb9c8 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -63,7 +63,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/event.h"
#include "asterisk/rtp_engine.h"
#include "asterisk/netsock2.h"
#include "asterisk/acl.h"
diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index 3b3902f34..8a63600bf 100644
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -8884,8 +8884,10 @@ static void sig_pri_send_mwi_indication(struct sig_pri_span *pri, const char *vm
* \brief MWI subscription event callback.
* \since 1.8
*
- * \param event the event being passed to the subscriber
- * \param userdata the data provider in the call to ast_event_subscribe()
+ * \param userdata the data provider in the call to stasis_subscribe()
+ * \param sub the subscription to which the message was delivered for this callback
+ * \param topic the topic on which the message was published
+ * \param msg the message being passed to the subscriber
*
* \return Nothing
*/
diff --git a/channels/sig_pri.h b/channels/sig_pri.h
index 62e0dc963..a46bca637 100644
--- a/channels/sig_pri.h
+++ b/channels/sig_pri.h
@@ -27,7 +27,6 @@
#include "asterisk/channel.h"
#include "asterisk/frame.h"
-#include "asterisk/event.h"
#include "asterisk/ccss.h"
#include <libpri.h>
#include <dahdi/user.h>