diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-07-07 20:38:42 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-07-07 20:38:42 -0500 |
| commit | b842a8dabf01b91ed5c972457ff14b059fdf90a2 (patch) | |
| tree | b0dc2bde114cc1aac35d773e02fec9da0f6ef16a /res | |
| parent | 84a6ed05b7e0bf53648386d518c2f83050c210a6 (diff) | |
| parent | 2f7688c7881d79f8ac1deb311766208f28468cf2 (diff) | |
Merge "res_pjsip_mwi.c: Use safer loop coding in mwi_subscription_mailboxes_str()." into 13
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip_mwi.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/res/res_pjsip_mwi.c b/res/res_pjsip_mwi.c index d5e1b0b69..06587daf7 100644 --- a/res/res_pjsip_mwi.c +++ b/res/res_pjsip_mwi.c @@ -782,16 +782,16 @@ static void *mwi_get_notify_data(struct ast_sip_subscription *sub) static void mwi_subscription_mailboxes_str(struct ao2_container *stasis_subs, struct ast_str **str) { - int num = ao2_container_count(stasis_subs); - + int is_first = 1; struct mwi_stasis_subscription *node; struct ao2_iterator i = ao2_iterator_init(stasis_subs, 0); while ((node = ao2_iterator_next(&i))) { - if (--num) { - ast_str_append(str, 0, "%s,", node->mailbox); - } else { + if (is_first) { + is_first = 0; ast_str_append(str, 0, "%s", node->mailbox); + } else { + ast_str_append(str, 0, ",%s", node->mailbox); } ao2_ref(node, -1); } @@ -846,7 +846,9 @@ static int serialized_cleanup(void *userdata) static int send_notify(void *obj, void *arg, int flags) { struct mwi_subscription *mwi_sub = obj; - struct ast_taskprocessor *serializer = mwi_sub->is_solicited ? ast_sip_subscription_get_serializer(mwi_sub->sip_sub) : NULL; + struct ast_taskprocessor *serializer = mwi_sub->is_solicited + ? ast_sip_subscription_get_serializer(mwi_sub->sip_sub) + : NULL; if (ast_sip_push_task(serializer, serialized_notify, ao2_bump(mwi_sub))) { ao2_ref(mwi_sub, -1); |