Merge pull request mozilla#21 from docfaraday/multistream_unit_tests

A couple of minor build fixes.
martinthomson · Sep 18, 2014 · 5c69ee0 · 5c69ee0
2 parents a4089cc + c0080c8
commit 5c69ee0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/media/webrtc/signaling/src/sdp/SipccSdp.cpp b/media/webrtc/signaling/src/sdp/SipccSdp.cpp
@@ -18,9 +18,9 @@ SipccSdp::GetSessionName() const {
   return "TODO";
 }
 
-std::string
+Maybe<std::string>
 SipccSdp::GetBandwidth(std::string type) const {
-  return "TODO";
+  return Maybe<std::string>();
 }
 
 const SdpMediaSection &

diff --git a/media/webrtc/signaling/src/sdp/SipccSdpParser.cpp b/media/webrtc/signaling/src/sdp/SipccSdpParser.cpp
@@ -27,7 +27,7 @@ SipccSdpParser::Parse(const std::string& sdpText)
   sdp_t *sdp = sdp_init_description(sipcc_config);
   if (sdp) {
     const char* rawString = sdpText.c_str();
-    sdp_result_e result = sdp_parse(sdp, &rawString, sdpText.length());
+    sdp_result_e result = sdp_parse(sdp, rawString, sdpText.length());
     if (result == SDP_SUCCESS) {
       SipccSdp* sipccSdp = new SipccSdp(sdp);
       sipccSdp->Load();

diff --git a/media/webrtc/signaling/src/sdp/sipcc/sdp.h b/media/webrtc/signaling/src/sdp/sipcc/sdp.h
@@ -1111,7 +1111,7 @@ extern void sdp_allow_choose(void *config_p, sdp_choose_param_e param,
 extern sdp_t *sdp_init_description(sdp_conf_options_t *config_p);
 extern void sdp_debug(sdp_t *sdp_ptr, sdp_debug_e debug_type, tinybool debug_flag);
 extern void sdp_set_string_debug(sdp_t *sdp_ptr, const char *debug_str);
-extern sdp_result_e sdp_parse(sdp_t *sdp_ptr, char **bufp, size_t len);
+extern sdp_result_e sdp_parse(sdp_t *sdp_ptr, const char *buf, size_t len);
 extern sdp_result_e sdp_build(sdp_t *sdp_ptr, flex_string *fs);
 extern sdp_result_e sdp_free_description(sdp_t *sdp_ptr);
 extern void sdp_parse_error(sdp_t *sdp, const char *format, ...);

diff --git a/media/webrtc/signaling/src/sdp/sipcc/sdp_main.c b/media/webrtc/signaling/src/sdp/sipcc/sdp_main.c
@@ -958,7 +958,7 @@ sdp_result_e sdp_validate_sdp (sdp_t *sdp_p)
  *              if not, what type of error was encountered.  The
  *              information from the parse is stored in the sdp_p structure.
  */
-sdp_result_e sdp_parse (sdp_t *sdp_p, char **bufp, size_t len)
+sdp_result_e sdp_parse (sdp_t *sdp_p, const char *buf, size_t len)
 {
     u8           i;
     u16          cur_level = SDP_SESSION_LEVEL;
@@ -971,6 +971,7 @@ sdp_result_e sdp_parse (sdp_t *sdp_p, char **bufp, size_t len)
     tinybool     end_found = FALSE;
     tinybool     first_line = TRUE;
     tinybool     unrec_token = FALSE;
+    const char   **bufp = &buf;
 
     if (sdp_verify_sdp_ptr(sdp_p) == FALSE) {
         return (SDP_INVALID_SDP_PTR);