From 803dc3dee50c1aac6f024abf3c77463dc86acfa9 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Mon, 6 Nov 2017 15:23:46 -0500 Subject: [PATCH] stasis: Remove silly use of RAII_VAR in stasis_forward_all. Change-Id: I46de4c968d40144d5b049966304ff66c1469fb65 --- main/stasis.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main/stasis.c b/main/stasis.c index 48e4eb5a55..372e9191dc 100644 --- a/main/stasis.c +++ b/main/stasis.c @@ -910,7 +910,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; @@ -923,7 +923,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); @@ -934,6 +934,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; } @@ -943,7 +944,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) -- 2.47.3