[asterisk-commits] dlee: branch group/performance r399867 - in /team/group/performance: ./ apps/...

[SVN commits to the Asterisk project]

Author: dlee
Date: Wed Sep 25 16:46:05 2013
New Revision: 399867

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399867
Log:
Fix extended support modules
........

Merged revisions 399866 from http://svn.asterisk.org/svn/asterisk/team/dlee/tp-local

Modified:
    team/group/performance/   (props changed)
    team/group/performance/apps/app_meetme.c
    team/group/performance/res/res_chan_stats.c
    team/group/performance/res/res_jabber.c

Propchange: team/group/performance/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Sep 25 16:46:05 2013
@@ -1,1 +1,1 @@
-/branches/12:1-399753 /team/dlee/performance:1-399659 /team/dlee/stasis-forward-optimization:1-399664 /team/dlee/taskprocessor-optimization:1-399654 /team/dlee/tp-local:1-399843
+/branches/12:1-399753 /team/dlee/performance:1-399659 /team/dlee/stasis-forward-optimization:1-399664 /team/dlee/taskprocessor-optimization:1-399654 /team/dlee/tp-local:1-399866

Modified: team/group/performance/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/group/performance/apps/app_meetme.c?view=diff&rev=399867&r1=399866&r2=399867
==============================================================================
--- team/group/performance/apps/app_meetme.c (original)
+++ team/group/performance/apps/app_meetme.c Wed Sep 25 16:46:05 2013
@@ -1139,7 +1139,7 @@
 STASIS_MESSAGE_TYPE_DEFN_LOCAL(meetme_talk_request_type);
 
 static void meetme_stasis_cb(void *data, struct stasis_subscription *sub,
-	struct stasis_topic *topic, struct stasis_message *message);
+	struct stasis_message *message);
 
 static void meetme_stasis_cleanup(void)
 {
@@ -1226,7 +1226,7 @@
 }
 
 static void meetme_stasis_cb(void *data, struct stasis_subscription *sub,
-	struct stasis_topic *topic, struct stasis_message *message)
+	struct stasis_message *message)
 {
 	struct ast_channel_blob *channel_blob = stasis_message_data(message);
 	struct stasis_message_type *message_type;

Modified: team/group/performance/res/res_chan_stats.c
URL: http://svnview.digium.com/svn/asterisk/team/group/performance/res/res_chan_stats.c?view=diff&rev=399867&r1=399866&r2=399867
==============================================================================
--- team/group/performance/res/res_chan_stats.c (original)
+++ team/group/performance/res/res_chan_stats.c Wed Sep 25 16:46:05 2013
@@ -57,7 +57,7 @@
  * \param message The message itself.
  */
 static void statsmaker(void *data, struct stasis_subscription *sub,
-	struct stasis_topic *topic, struct stasis_message *message)
+	struct stasis_message *message)
 {
 	RAII_VAR(struct ast_str *, metric, NULL, ast_free);
 
@@ -89,7 +89,7 @@
  * \param message The message itself.
  */
 static void updates(void *data, struct stasis_subscription *sub,
-	struct stasis_topic *topic, struct stasis_message *message)
+	struct stasis_message *message)
 {
 	/* Since this came from a message router, we know the type of the
 	 * message. We can cast the data without checking its type.
@@ -139,7 +139,7 @@
  * \param message The message itself.
  */
 static void default_route(void *data, struct stasis_subscription *sub,
-	struct stasis_topic *topic, struct stasis_message *message)
+	struct stasis_message *message)
 {
 	if (stasis_subscription_final_message(sub, message)) {
 		/* Much like with the regular subscription, you may need to

Modified: team/group/performance/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/team/group/performance/res/res_jabber.c?view=diff&rev=399867&r1=399866&r2=399867
==============================================================================
--- team/group/performance/res/res_jabber.c (original)
+++ team/group/performance/res/res_jabber.c Wed Sep 25 16:46:05 2013
@@ -371,8 +371,8 @@
 	const char* collection_name);
 static void aji_publish_mwi(struct aji_client *client, const char *mailbox,
 	const char *context, const char *oldmsgs, const char *newmsgs);
-static void aji_devstate_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg);
-static void aji_mwi_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg);
+static void aji_devstate_cb(void *data, struct stasis_subscription *sub, struct stasis_message *msg);
+static void aji_mwi_cb(void *data, struct stasis_subscription *sub, struct stasis_message *msg);
 static iks* aji_build_publish_skeleton(struct aji_client *client, const char *node,
 				       const char *event_type, unsigned int cachable);
 /* No transports in this version */
@@ -3235,7 +3235,7 @@
  * \param data void pointer to ast_client structure
  * \return void
  */
-static void aji_mwi_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg)
+static void aji_mwi_cb(void *data, struct stasis_subscription *sub, struct stasis_message *msg)
 {
 	const char *mailbox;
 	const char *context;
@@ -3269,7 +3269,7 @@
  * \param data void pointer to ast_client structure
  * \return void
  */
-static void aji_devstate_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg)
+static void aji_devstate_cb(void *data, struct stasis_subscription *sub, struct stasis_message *msg)
 {
 	struct aji_client *client = data;
 	struct ast_device_state_message *dev_state;
@@ -3291,7 +3291,7 @@
 {
 	struct stasis_message *msg = obj;
 	struct aji_client *client = arg;
-	aji_devstate_cb(client, device_state_sub, NULL, msg);
+	aji_devstate_cb(client, device_state_sub, msg);
 	return 0;
 }