[asterisk-commits] rtp engine.c: Tweak glue->update peer() parameter nil value. (asterisk[11])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Aug 3 08:42:10 CDT 2015


Joshua Colp has submitted this change and it was merged.

Change subject: rtp_engine.c: Tweak glue->update_peer() parameter nil value.
......................................................................


rtp_engine.c: Tweak glue->update_peer() parameter nil value.

Change glue->update_peer() parameter from 0 to NULL to better indicate it
is a pointer.

Change-Id: Iefbf9d4a708f2b64b7ad2b4e6c33bfaa12ccfa9d
---
M main/rtp_engine.c
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Mark Michelson: Looks good to me, but someone else must approve
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved



diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index 60b3f55..ac349e8 100644
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -1346,9 +1346,9 @@
 				if (fr->subclass.integer == AST_CONTROL_HOLD) {
 					/* If we someone went on hold we want the other side to reinvite back to us */
 					if (who == c0) {
-						glue1->update_peer(c1, NULL, NULL, NULL, 0, 0);
+						glue1->update_peer(c1, NULL, NULL, NULL, NULL, 0);
 					} else {
-						glue0->update_peer(c0, NULL, NULL, NULL, 0, 0);
+						glue0->update_peer(c0, NULL, NULL, NULL, NULL, 0);
 					}
 				} else if (fr->subclass.integer == AST_CONTROL_UNHOLD ||
 					fr->subclass.integer == AST_CONTROL_UPDATE_RTP_PEER) {
@@ -1435,7 +1435,7 @@
 		ast_debug(1, "Channel c0->'%s' pvt changed, in bridge with c1->'%s'\n", ast_channel_name(c0), ast_channel_name(c1));
 	} else if (glue0 != ast_rtp_instance_get_glue(ast_channel_tech(c0)->type)) {
 		ast_debug(1, "Channel c0->'%s' technology changed, in bridge with c1->'%s'\n", ast_channel_name(c0), ast_channel_name(c1));
-	} else if (glue0->update_peer(c0, NULL, NULL, NULL, 0, 0)) {
+	} else if (glue0->update_peer(c0, NULL, NULL, NULL, NULL, 0)) {
 		ast_log(LOG_WARNING, "Channel '%s' failed to break RTP bridge\n", ast_channel_name(c0));
 	}
 	if (ast_test_flag(ast_channel_flags(c1), AST_FLAG_ZOMBIE)) {
@@ -1444,7 +1444,7 @@
 		ast_debug(1, "Channel c1->'%s' pvt changed, in bridge with c0->'%s'\n", ast_channel_name(c1), ast_channel_name(c0));
 	} else if (glue1 != ast_rtp_instance_get_glue(ast_channel_tech(c1)->type)) {
 		ast_debug(1, "Channel c1->'%s' technology changed, in bridge with c0->'%s'\n", ast_channel_name(c1), ast_channel_name(c0));
-	} else if (glue1->update_peer(c1, NULL, NULL, NULL, 0, 0)) {
+	} else if (glue1->update_peer(c1, NULL, NULL, NULL, NULL, 0)) {
 		ast_log(LOG_WARNING, "Channel '%s' failed to break RTP bridge\n", ast_channel_name(c1));
 	}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iefbf9d4a708f2b64b7ad2b4e6c33bfaa12ccfa9d
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>



More information about the asterisk-commits mailing list