From bd11159dbc065ffbcfad30494ae165b8ed17e05c Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Tue, 9 Jan 2018 11:55:37 -0500 Subject: [PATCH] stasis_message_router: Remove silly usage of RAII_VAR. Change-Id: I50d6ae230920e0b878ed9cc8f79eef746e06701d --- main/stasis_message_router.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/main/stasis_message_router.c b/main/stasis_message_router.c index cf0ac787ed..498ddd6c2f 100644 --- a/main/stasis_message_router.c +++ b/main/stasis_message_router.c @@ -210,7 +210,7 @@ static struct stasis_message_router *stasis_message_router_create_internal( struct stasis_topic *topic, int use_thread_pool) { int res; - RAII_VAR(struct stasis_message_router *, router, NULL, ao2_cleanup); + struct stasis_message_router *router; router = ao2_t_alloc(sizeof(*router), router_dtor, stasis_topic_name(topic)); if (!router) { @@ -221,6 +221,8 @@ static struct stasis_message_router *stasis_message_router_create_internal( res |= AST_VECTOR_INIT(&router->routes, 0); res |= AST_VECTOR_INIT(&router->cache_routes, 0); if (res) { + ao2_ref(router, -1); + return NULL; } @@ -230,10 +232,11 @@ static struct stasis_message_router *stasis_message_router_create_internal( router->subscription = stasis_subscribe(topic, router_dispatch, router); } if (!router->subscription) { + ao2_ref(router, -1); + return NULL; } - ao2_ref(router, +1); return router; }