[Asterisk-code-review] abstract jb: Remove silly usage of RAII VAR. (asterisk[master])

Joshua Colp asteriskteam at digium.com
Tue Nov 21 11:04:47 CST 2017


Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/7315 )

Change subject: abstract_jb: Remove silly usage of RAII_VAR.
......................................................................

abstract_jb: Remove silly usage of RAII_VAR.

Change-Id: I9d56175369363d1dc735504cf78a3a5577069f49
---
M main/abstract_jb.c
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index 0f0e661..b375739 100644
--- a/main/abstract_jb.c
+++ b/main/abstract_jb.c
@@ -443,7 +443,7 @@
 
 	/* 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;
 
@@ -479,6 +479,8 @@
 			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));

-- 
To view, visit https://gerrit.asterisk.org/7315
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d56175369363d1dc735504cf78a3a5577069f49
Gerrit-Change-Number: 7315
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171121/fc7bab3a/attachment.html>


More information about the asterisk-code-review mailing list