From: Corey Farrell <git@cfware.com>
Date: Thu, 16 Nov 2017 18:55:14 +0000 (-0500)
Subject: abstract_jb: Remove silly usage of RAII_VAR.
X-Git-Tag: 13.19.0-rc1~96^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=746dd80eab0b243e533fcb26ad63fe322541ae03;p=thirdparty%2Fasterisk.git

abstract_jb: Remove silly usage of RAII_VAR.

Change-Id: I9d56175369363d1dc735504cf78a3a5577069f49
---

diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index 1c9eb5172f..6e776c0cce 100644
--- a/main/abstract_jb.c
+++ b/main/abstract_jb.c
@@ -445,7 +445,7 @@ static int create_jb(struct ast_channel *chan, struct ast_frame *frr)
 
 	/* Create a frame log file */
 	if (ast_test_flag(jbconf, AST_JB_LOG)) {
-		RAII_VAR(struct ast_channel *, bridged, ast_channel_bridge_peer(chan), ast_channel_cleanup);
+		struct ast_channel *bridged = ast_channel_bridge_peer(chan);
 		char safe_logfile[30] = "/tmp/logfile-XXXXXX";
 		int safe_fd;
 
@@ -481,6 +481,8 @@ static int create_jb(struct ast_channel *chan, struct ast_frame *frr)
 			jb_framelog("JB_PUT_FIRST {now=%ld}: Dropped frame with ts=%ld and len=%ld\n",
 				now, frr->ts, frr->len);
 		}
+
+		ast_channel_cleanup(bridged);
 	}
 
 	ast_verb(3, "%s jitterbuffer created on channel %s\n", jbimpl->name, ast_channel_name(chan));