[asterisk-commits] kmoore: branch kmoore/stasis-mwi r382388 - in /team/kmoore/stasis-mwi: apps/ ...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Mar 4 14:45:07 CST 2013
Author: kmoore
Date: Mon Mar 4 14:45:03 2013
New Revision: 382388
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382388
Log:
Trash some junk whitespace in code adjacent to diffs in this branch
Modified:
team/kmoore/stasis-mwi/apps/app_voicemail.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/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-mwi/apps/app_voicemail.c?view=diff&rev=382388&r1=382387&r2=382388
==============================================================================
--- team/kmoore/stasis-mwi/apps/app_voicemail.c (original)
+++ team/kmoore/stasis-mwi/apps/app_voicemail.c Mon Mar 4 14:45:03 2013
@@ -12530,7 +12530,7 @@
{
struct mwi_sub *mwi_sub;
char *uniqueid = datap;
-
+
AST_RWLIST_WRLOCK(&mwi_subs);
AST_RWLIST_TRAVERSE_SAFE_BEGIN(&mwi_subs, mwi_sub, entry) {
if (!strcmp(mwi_sub->uniqueid, uniqueid)) {
@@ -12543,7 +12543,7 @@
AST_RWLIST_TRAVERSE_SAFE_END
AST_RWLIST_UNLOCK(&mwi_subs);
- ast_free(uniqueid);
+ ast_free(uniqueid);
return 0;
}
@@ -12602,7 +12602,7 @@
struct mwi_sub_task *mwist;
char *context = ast_strdupa(stasis_topic_name(change->topic));
char *mailbox;
-
+
if ((mwist = ast_calloc(1, (sizeof(*mwist)))) == NULL) {
ast_log(LOG_ERROR, "could not allocate a mwi_sub_task\n");
return;
@@ -12613,7 +12613,7 @@
mwist->mailbox = ast_strdup(mailbox);
mwist->context = ast_strdup(context);
mwist->uniqueid = ast_strdup(change->uniqueid);
-
+
if (ast_taskprocessor_push(mwi_subscription_tps, handle_subscribe, mwist) < 0) {
ast_free(mwist);
}
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=382388&r1=382387&r2=382388
==============================================================================
--- team/kmoore/stasis-mwi/include/asterisk/app.h (original)
+++ team/kmoore/stasis-mwi/include/asterisk/app.h Mon Mar 4 14:45:03 2013
@@ -1180,4 +1180,3 @@
#endif
#endif /* _ASTERISK_APP_H */
-
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=382388&r1=382387&r2=382388
==============================================================================
--- team/kmoore/stasis-mwi/main/app.c (original)
+++ team/kmoore/stasis-mwi/main/app.c Mon Mar 4 14:45:03 2013
@@ -2709,7 +2709,7 @@
if (!topic->uniqueid) {
return NULL;
}
-
+
ao2_link(__mwi_topics, topic);
return topic->topic;
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=382388&r1=382387&r2=382388
==============================================================================
--- team/kmoore/stasis-mwi/res/res_jabber.c (original)
+++ team/kmoore/stasis-mwi/res/res_jabber.c Mon Mar 4 14:45:03 2013
@@ -3262,7 +3262,7 @@
client = ASTOBJ_REF((struct aji_client *) data);
mwi_state = stasis_message_data(msg);
-
+
mailbox = mwi_state->mailbox;
context = mwi_state->context;
snprintf(oldmsgs, sizeof(oldmsgs), "%d",
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=382388&r1=382387&r2=382388
==============================================================================
--- team/kmoore/stasis-mwi/res/res_xmpp.c (original)
+++ team/kmoore/stasis-mwi/res/res_xmpp.c Mon Mar 4 14:45:03 2013
@@ -1598,7 +1598,6 @@
if (ast_enable_distributed_devstate()) {
return;
}
-
if (!(client->device_state_sub = ast_event_subscribe(AST_EVENT_DEVICE_STATE_CHANGE,
xmpp_pubsub_devstate_cb, "xmpp_pubsub_devstate_subscription", client, AST_EVENT_IE_END))) {
More information about the asterisk-commits
mailing list