kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

stasis_message_router: Remove silly usage of RAII_VAR.

Browse Source 
Change-Id: I50d6ae230920e0b878ed9cc8f79eef746e06701d
This commit is contained in:
Corey Farrell
2018-01-09 11:55:37 -05:00
parent 9397c2535c
commit 4b655184b0
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/stasis_message_router.c
View File

@@ -208,7 +208,7 @@ static struct stasis_message_router *stasis_message_router_create_internal(
struct stasis_topic *topic, int use_thread_pool) struct stasis_topic *topic, int use_thread_pool)
{ {
int res; 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)); router = ao2_t_alloc(sizeof(*router), router_dtor, stasis_topic_name(topic));
if (!router) { if (!router) {
@@ -219,6 +219,8 @@ static struct stasis_message_router *stasis_message_router_create_internal(
res |= AST_VECTOR_INIT(&router->routes, 0); res |= AST_VECTOR_INIT(&router->routes, 0);
res |= AST_VECTOR_INIT(&router->cache_routes, 0); res |= AST_VECTOR_INIT(&router->cache_routes, 0);
if (res) { if (res) {
ao2_ref(router, -1);
return NULL; return NULL;
} }
@@ -228,10 +230,11 @@ static struct stasis_message_router *stasis_message_router_create_internal(
router->subscription = stasis_subscribe(topic, router_dispatch, router); router->subscription = stasis_subscribe(topic, router_dispatch, router);
} }
if (!router->subscription) { if (!router->subscription) {
ao2_ref(router, -1);
return NULL; return NULL;
} }
ao2_ref(router, +1);
return router; return router;
} }