From: Corey Farrell <git@cfware.com>
Date: Tue, 9 Jan 2018 16:55:37 +0000 (-0500)
Subject: stasis_message_router: Remove silly usage of RAII_VAR.
X-Git-Tag: 15.3.0-rc1~108^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10b0b6583f905f8468b4e6c15dabb93710dcc98d;p=thirdparty%2Fasterisk.git

stasis_message_router: Remove silly usage of RAII_VAR.

Change-Id: I50d6ae230920e0b878ed9cc8f79eef746e06701d
---

diff --git a/main/stasis_message_router.c b/main/stasis_message_router.c
index 2c8d0a7684..41d426beca 100644
--- a/main/stasis_message_router.c
+++ b/main/stasis_message_router.c
@@ -208,7 +208,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) {
@@ -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->cache_routes, 0);
 	if (res) {
+		ao2_ref(router, -1);
+
 		return NULL;
 	}
 
@@ -228,10 +230,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;
 }