Skip to content
Snippets Groups Projects
Commit 64bcb65a authored by Corey Farrell's avatar Corey Farrell
Browse files

stasis: Remove silly use of RAII_VAR in stasis_forward_all.

Change-Id: I46de4c968d40144d5b049966304ff66c1469fb65
parent 637b37fb
No related branches found
No related tags found
No related merge requests found
......@@ -908,7 +908,7 @@ struct stasis_forward *stasis_forward_all(struct stasis_topic *from_topic,
{
int res;
size_t idx;
RAII_VAR(struct stasis_forward *, forward, NULL, ao2_cleanup);
struct stasis_forward *forward;
if (!from_topic || !to_topic) {
return NULL;
......@@ -921,7 +921,7 @@ struct stasis_forward *stasis_forward_all(struct stasis_topic *from_topic,
/* Forwards to ourselves are implicit. */
if (to_topic == from_topic) {
return ao2_bump(forward);
return forward;
}
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) {
ao2_unlock(from_topic);
ao2_unlock(to_topic);
ao2_ref(forward, -1);
return NULL;
}
......@@ -941,7 +942,7 @@ struct stasis_forward *stasis_forward_all(struct stasis_topic *from_topic,
ao2_unlock(from_topic);
ao2_unlock(to_topic);
return ao2_bump(forward);
return forward;
}
static void subscription_change_dtor(void *obj)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment