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

Merge "stasis: Remove silly use of RAII_VAR in stasis_forward_all."

Browse Source
This commit is contained in:
Joshua Colp
2017-11-07 09:32:45 -06:00
committed by Gerrit Code Review
parent a34b36c513 64bcb65a78
commit 83c61383c8
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

@@ -908,7 +908,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;
@@ -921,7 +921,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);
@@ -932,6 +932,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;
} }
@@ -941,7 +942,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)