[Asterisk-code-review] chan_pjsip: don't use PJSIP_SC_NULL as it only exists pjproject 2.8+ (asterisk[16])

George Joseph asteriskteam at digium.com
Thu Jun 25 09:48:24 CDT 2020


George Joseph has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/14571 )

Change subject: chan_pjsip: don't use PJSIP_SC_NULL as it only exists pjproject 2.8+
......................................................................

chan_pjsip: don't use PJSIP_SC_NULL as it only exists pjproject 2.8+

A patch made a reference to the PJSIP_SC_NULL enumeration value, which
was added to pjproject 2.8 and above thus making it so Asterisk would
fail to compile with prior versions of pjproject.

This patch removes the reference, and instead initializes the value
to '0'.

ASTERISK-28886 #close

Change-Id: I68491c80da1a0154b2286c9458440141c98db9d7
---
M channels/chan_pjsip.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit



diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c
index 692151a..c77bced 100644
--- a/channels/chan_pjsip.c
+++ b/channels/chan_pjsip.c
@@ -1999,7 +1999,7 @@
 		/* Check for NOTIFY complete or error. */
 		pjsip_msg *msg;
 		pjsip_msg_body *body;
-		pjsip_status_line status_line = { .code = PJSIP_SC_NULL };
+		pjsip_status_line status_line = { .code = 0 };
 		pj_bool_t is_last;
 		pj_status_t status;
 

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/14571
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 16
Gerrit-Change-Id: I68491c80da1a0154b2286c9458440141c98db9d7
Gerrit-Change-Number: 14571
Gerrit-PatchSet: 2
Gerrit-Owner: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20200625/795e3c95/attachment.html>


More information about the asterisk-code-review mailing list