kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-09 14:36:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

stasis: Remove silly use of RAII_VAR in stasis_forward_all.

Browse Source 
Change-Id: I46de4c968d40144d5b049966304ff66c1469fb65
This commit is contained in:
Corey Farrell
2017-11-06 15:23:46 -05:00
parent ad7860fd19
commit 803dc3dee5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/stasis.c
View File

@@ -910,7 +910,7 @@ struct stasis_forward *stasis_forward_all(struct stasis_topic *from_topic,
{ {
int res; int res;
size_t idx; size_t idx;
RAII_VAR(struct stasis_forward *, forward, NULL, ao2_cleanup); struct stasis_forward *forward;
if (!from_topic || !to_topic) { if (!from_topic || !to_topic) {
return NULL; return NULL;
@@ -923,7 +923,7 @@ struct stasis_forward *stasis_forward_all(struct stasis_topic *from_topic,
/* Forwards to ourselves are implicit. */ /* Forwards to ourselves are implicit. */
if (to_topic == from_topic) { if (to_topic == from_topic) {
return ao2_bump(forward); return forward;
} }
forward->from_topic = ao2_bump(from_topic); forward->from_topic = ao2_bump(from_topic);
@@ -934,6 +934,7 @@ struct stasis_forward *stasis_forward_all(struct stasis_topic *from_topic,
if (res != 0) { if (res != 0) {
ao2_unlock(from_topic); ao2_unlock(from_topic);
ao2_unlock(to_topic); ao2_unlock(to_topic);
ao2_ref(forward, -1);
return NULL; return NULL;
} }
@@ -943,7 +944,7 @@ struct stasis_forward *stasis_forward_all(struct stasis_topic *from_topic,
ao2_unlock(from_topic); ao2_unlock(from_topic);
ao2_unlock(to_topic); ao2_unlock(to_topic);
return ao2_bump(forward); return forward;
} }
static void subscription_change_dtor(void *obj) static void subscription_change_dtor(void *obj)