[svn-commits] kmoore: branch kmoore/stasis-mwi r382324 - in /team/kmoore/stasis-mwi: channe...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Feb 28 22:49:19 CST 2013
Author: kmoore
Date: Thu Feb 28 22:49:14 2013
New Revision: 382324
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382324
Log:
Change stasis_mwi_message_type to stasis_mwi_state for consistency
Modified:
team/kmoore/stasis-mwi/channels/chan_dahdi.c
team/kmoore/stasis-mwi/channels/chan_iax2.c
team/kmoore/stasis-mwi/channels/chan_sip.c
team/kmoore/stasis-mwi/channels/chan_skinny.c
team/kmoore/stasis-mwi/channels/chan_unistim.c
team/kmoore/stasis-mwi/channels/sig_pri.c
team/kmoore/stasis-mwi/include/asterisk/app.h
team/kmoore/stasis-mwi/main/app.c
team/kmoore/stasis-mwi/res/res_jabber.c
team/kmoore/stasis-mwi/res/res_xmpp.c
Modified: team/kmoore/stasis-mwi/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-mwi/channels/chan_dahdi.c?view=diff&rev=382324&r1=382323&r2=382324
==============================================================================
--- team/kmoore/stasis-mwi/channels/chan_dahdi.c (original)
+++ team/kmoore/stasis-mwi/channels/chan_dahdi.c Thu Feb 28 22:49:14 2013
@@ -5425,7 +5425,7 @@
}
ast_str_set(&uniqueid, 0, "%s@%s", mailbox, context);
- mwi_message = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_message_type(), ast_str_buffer(uniqueid));
+ mwi_message = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state(), ast_str_buffer(uniqueid));
if (mwi_message) {
struct stasis_mwi_state *mwi_state = stasis_message_data(mwi_message);
Modified: team/kmoore/stasis-mwi/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-mwi/channels/chan_iax2.c?view=diff&rev=382324&r1=382323&r2=382324
==============================================================================
--- team/kmoore/stasis-mwi/channels/chan_iax2.c (original)
+++ team/kmoore/stasis-mwi/channels/chan_iax2.c Thu Feb 28 22:49:14 2013
@@ -8755,7 +8755,7 @@
}
ast_str_set(&uniqueid, 0, "%s@%s", mailbox, context);
- msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_message_type(), ast_str_buffer(uniqueid));
+ msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state(), ast_str_buffer(uniqueid));
if (msg) {
struct stasis_mwi_state *mwi_state = stasis_message_data(msg);
Modified: team/kmoore/stasis-mwi/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-mwi/channels/chan_sip.c?view=diff&rev=382324&r1=382323&r2=382324
==============================================================================
--- team/kmoore/stasis-mwi/channels/chan_sip.c (original)
+++ team/kmoore/stasis-mwi/channels/chan_sip.c Thu Feb 28 22:49:14 2013
@@ -16507,7 +16507,7 @@
static void mwi_event_cb(void *userdata, struct stasis_topic *topic, struct stasis_message *msg)
{
struct sip_peer *peer = userdata;
- if (stasis_mwi_message_type() != stasis_message_type(msg)) {
+ if (stasis_mwi_state() != stasis_message_type(msg)) {
sip_send_mwi_to_peer(peer, 0);
}
}
@@ -28691,7 +28691,7 @@
ast_str_reset(uniqueid);
ast_str_set(&uniqueid, 0, "%s@%s", mailbox->mailbox, S_OR(mailbox->context, "default"));
- msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_message_type(), ast_str_buffer(uniqueid));
+ msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state(), ast_str_buffer(uniqueid));
if (!msg) {
continue;
}
Modified: team/kmoore/stasis-mwi/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-mwi/channels/chan_skinny.c?view=diff&rev=382324&r1=382323&r2=382324
==============================================================================
--- team/kmoore/stasis-mwi/channels/chan_skinny.c (original)
+++ team/kmoore/stasis-mwi/channels/chan_skinny.c Thu Feb 28 22:49:14 2013
@@ -3518,7 +3518,7 @@
return;
}
- if (msg && stasis_mwi_message_type() == stasis_message_type(msg)) {
+ if (msg && stasis_mwi_state() == stasis_message_type(msg)) {
struct stasis_mwi_state *mwi_state = stasis_message_data(msg);
l->newmsgs = mwi_state->new_msgs;
}
Modified: team/kmoore/stasis-mwi/channels/chan_unistim.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-mwi/channels/chan_unistim.c?view=diff&rev=382324&r1=382323&r2=382324
==============================================================================
--- team/kmoore/stasis-mwi/channels/chan_unistim.c (original)
+++ team/kmoore/stasis-mwi/channels/chan_unistim.c Thu Feb 28 22:49:14 2013
@@ -5511,7 +5511,7 @@
ast_str_set(&uniqueid, 0, "%s@%s", mailbox, context);
- msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_message_type(), ast_str_buffer(uniqueid));
+ msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state(), ast_str_buffer(uniqueid));
if (msg) {
struct stasis_mwi_state *mwi_state = stasis_message_data(msg);
Modified: team/kmoore/stasis-mwi/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-mwi/channels/sig_pri.c?view=diff&rev=382324&r1=382323&r2=382324
==============================================================================
--- team/kmoore/stasis-mwi/channels/sig_pri.c (original)
+++ team/kmoore/stasis-mwi/channels/sig_pri.c Thu Feb 28 22:49:14 2013
@@ -8761,7 +8761,7 @@
int idx;
struct stasis_mwi_state *mwi_state;
- if (stasis_mwi_message_type() != stasis_message_type(msg)) {
+ if (stasis_mwi_state() != stasis_message_type(msg)) {
return;
}
@@ -8819,7 +8819,7 @@
ast_str_reset(uniqueid);
ast_str_set(&uniqueid, 0, "%s@%s", pri->mbox[idx].number, pri->mbox[idx].context);
- msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_message_type(), ast_str_buffer(uniqueid));
+ msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state(), ast_str_buffer(uniqueid));
if (!msg) {
/* No cached event for this mailbox. */
continue;
Modified: team/kmoore/stasis-mwi/include/asterisk/app.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-mwi/include/asterisk/app.h?view=diff&rev=382324&r1=382323&r2=382324
==============================================================================
--- team/kmoore/stasis-mwi/include/asterisk/app.h (original)
+++ team/kmoore/stasis-mwi/include/asterisk/app.h Thu Feb 28 22:49:14 2013
@@ -1166,7 +1166,7 @@
* \retval NULL if it has not been allocated
* \since 12
*/
-struct stasis_message_type *stasis_mwi_message_type(void);
+struct stasis_message_type *stasis_mwi_state(void);
/*!
* \brief Initialize the application core
Modified: team/kmoore/stasis-mwi/main/app.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-mwi/main/app.c?view=diff&rev=382324&r1=382323&r2=382324
==============================================================================
--- team/kmoore/stasis-mwi/main/app.c (original)
+++ team/kmoore/stasis-mwi/main/app.c Thu Feb 28 22:49:14 2013
@@ -2676,7 +2676,7 @@
return __mwi_topic_cached;
}
-struct stasis_message_type *stasis_mwi_message_type(void)
+struct stasis_message_type *stasis_mwi_state(void)
{
return __mwi_message_type;
}
@@ -2737,7 +2737,7 @@
mwi_state->new_msgs = new_msgs;
mwi_state->old_msgs = old_msgs;
- message = stasis_message_create(stasis_mwi_message_type(), mwi_state);
+ message = stasis_message_create(stasis_mwi_state(), mwi_state);
if (eid) {
stasis_message_eid_set(message, eid);
}
@@ -2752,7 +2752,7 @@
static const char *mwi_state_get_id(struct stasis_message *message)
{
struct stasis_mwi_state *mwi_state;
- if (stasis_mwi_message_type() != stasis_message_type(message)) {
+ if (stasis_mwi_state() != stasis_message_type(message)) {
return NULL;
}
Modified: team/kmoore/stasis-mwi/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-mwi/res/res_jabber.c?view=diff&rev=382324&r1=382323&r2=382324
==============================================================================
--- team/kmoore/stasis-mwi/res/res_jabber.c (original)
+++ team/kmoore/stasis-mwi/res/res_jabber.c Thu Feb 28 22:49:14 2013
@@ -3249,7 +3249,7 @@
struct aji_client *client;
struct stasis_mwi_state *mwi_state;
- if (stasis_mwi_message_type() != stasis_message_type(msg)) {
+ if (stasis_mwi_state() != stasis_message_type(msg)) {
return;
}
Modified: team/kmoore/stasis-mwi/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-mwi/res/res_xmpp.c?view=diff&rev=382324&r1=382323&r2=382324
==============================================================================
--- team/kmoore/stasis-mwi/res/res_xmpp.c (original)
+++ team/kmoore/stasis-mwi/res/res_xmpp.c Thu Feb 28 22:49:14 2013
@@ -1326,7 +1326,7 @@
char oldmsgs[10], newmsgs[10];
struct stasis_mwi_state *mwi_state;
- if (stasis_mwi_message_type() != stasis_message_type(msg)) {
+ if (stasis_mwi_state() != stasis_message_type(msg)) {
return;
}
More information about the svn-commits
mailing list