summaryrefslogtreecommitdiffstats
path: root/media/webrtc/signaling/src/sdp/sipcc/sdp_token.c
diff options
context:
space:
mode:
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>2018-06-13 14:29:20 -0700
committerwolfbeast <mcwerewolf@gmail.com>2018-06-29 08:39:41 +0200
commit92a7dcc5b77e4f78ad97cc9e8b870f9635422c6c (patch)
tree0cc87e44c150fb155ae9e181db4087667b5550b0 /media/webrtc/signaling/src/sdp/sipcc/sdp_token.c
parentce38876a4daa5170485f752d4007c8fdfbbe8ccc (diff)
downloadUXP-92a7dcc5b77e4f78ad97cc9e8b870f9635422c6c.tar
UXP-92a7dcc5b77e4f78ad97cc9e8b870f9635422c6c.tar.gz
UXP-92a7dcc5b77e4f78ad97cc9e8b870f9635422c6c.tar.lz
UXP-92a7dcc5b77e4f78ad97cc9e8b870f9635422c6c.tar.xz
UXP-92a7dcc5b77e4f78ad97cc9e8b870f9635422c6c.zip
Bug 1464063 - Remove sdp_getchoosetok. r=bwc, a=RyanVM
WebRTC
Diffstat (limited to 'media/webrtc/signaling/src/sdp/sipcc/sdp_token.c')
-rw-r--r--media/webrtc/signaling/src/sdp/sipcc/sdp_token.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/media/webrtc/signaling/src/sdp/sipcc/sdp_token.c b/media/webrtc/signaling/src/sdp/sipcc/sdp_token.c
index a002f9a73..f9eb04198 100644
--- a/media/webrtc/signaling/src/sdp/sipcc/sdp_token.c
+++ b/media/webrtc/signaling/src/sdp/sipcc/sdp_token.c
@@ -1162,15 +1162,11 @@ sdp_result_e sdp_parse_media (sdp_t *sdp_p, uint16_t level, const char *ptr)
}
port_ptr = port;
for (i=0; i < SDP_MAX_PORT_PARAMS; i++) {
- if (sdp_getchoosetok(port_ptr, &port_ptr, "/ \t", &result) == TRUE) {
- num[i] = SDP_CHOOSE_PARAM;
- } else {
- num[i] = sdp_getnextnumtok(port_ptr, (const char **)&port_ptr,
- "/ \t", &result);
- if (result != SDP_SUCCESS) {
- break;
- }
- }
+ num[i] = sdp_getnextnumtok(port_ptr, (const char **)&port_ptr,
+ "/ \t", &result);
+ if (result != SDP_SUCCESS) {
+ break;
+ }
num_port_params++;
}
@@ -1396,10 +1392,8 @@ sdp_result_e sdp_parse_media (sdp_t *sdp_p, uint16_t level, const char *ptr)
}
port_ptr = port;
- if (sdp_getchoosetok(port_ptr, &port_ptr, "/ \t", &result)) {
- sctp_port = SDP_CHOOSE_PARAM;
- } else {
- sctp_port = sdp_getnextnumtok(port_ptr, (const char **)&port_ptr,
+ {
+ sctp_port = sdp_getnextnumtok(port_ptr, (const char **)&port_ptr,
"/ \t", &result);
if (result != SDP_SUCCESS) {
sdp_parse_error(sdp_p,