Changeset 6009

Timestamp:

May 27, 2019 3:01:08 PM (4 years ago)

Author:

riza

Message:

Re #2147 (misc): Fix various compilation warnings on VS2015.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/sdp.c (modified) (2 diffs)
• pjmedia/src/pjmedia/transport_ice.c (modified) (1 diff)
• pjmedia/src/pjmedia/transport_loop.c (modified) (1 diff)
• pjsip/src/pjsua2/account.cpp (modified) (1 diff)
• pjsip/src/pjsua2/call.cpp (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -507 +507 @@
     /* Parse */
     PJ_TRY {
-        pj_str_t attr;
+        pj_str_t scan_attr;
 
         /* Get the ssrc */
@@ -514 +514 @@
 
         pj_scan_get_char(&scanner);
-        pj_scan_get(&scanner, &cs_token, &attr);
+        pj_scan_get(&scanner, &cs_token, &scan_attr);
         
         /* Get cname attribute, if any */
         if (!pj_scan_is_eof(&scanner) &&
             pj_scan_get_char(&scanner) == ':' &&
-            pj_strcmp2(&attr, "cname"))
+            pj_strcmp2(&scan_attr, "cname"))
         {
             pj_scan_get(&scanner, &cs_token, &ssrc->cname);

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -765 +765 @@
     /* Add a=rtcp-mux attribute */
     if (rtcp_mux) {
-        pjmedia_sdp_attr *attr;
-
-        attr = PJ_POOL_ZALLOC_T(sdp_pool, pjmedia_sdp_attr);
-        attr->name = STR_RTCP_MUX;
-        m->attr[m->attr_count++] = attr;
+        pjmedia_sdp_attr *add_attr;
+
+        add_attr = PJ_POOL_ZALLOC_T(sdp_pool, pjmedia_sdp_attr);
+        add_attr->name = STR_RTCP_MUX;
+        m->attr[m->attr_count++] = add_attr;
     }
 

pjproject/trunk/pjmedia/src/pjmedia/transport_loop.c

@@ -241 +241 @@
     info->sock_info.rtp_sock = 1;
     pj_sockaddr_init(loop->setting.af, &info->sock_info.rtp_addr_name, 
-                     &loop->setting.addr, loop->setting.port);
+                     &loop->setting.addr, (pj_uint16_t)loop->setting.port);
     info->sock_info.rtcp_sock = 2;
     pj_sockaddr_init(loop->setting.af, &info->sock_info.rtcp_addr_name,
-                     &loop->setting.addr, loop->setting.port + 1);
+                     &loop->setting.addr, (pj_uint16_t)loop->setting.port + 1);
 
     return PJ_SUCCESS;

pjproject/trunk/pjsip/src/pjsua2/account.cpp

@@ -1061 +1061 @@
 {
     pj_str_t pj_uri;
-    pjsua_buddy_id id;
+    pjsua_buddy_id bud_id;
 
     pj_strset2(&pj_uri, (char*)uri.c_str());
 
-    id = pjsua_buddy_find(&pj_uri);
+    bud_id = pjsua_buddy_find(&pj_uri);
     if (id == PJSUA_INVALID_ID) {
         PJSUA2_RAISE_ERROR(PJ_ENOTFOUND);
     }
 
-    Buddy buddy(id);
+    Buddy buddy(bud_id);
     return buddy;
 }

pjproject/trunk/pjsip/src/pjsua2/call.cpp

@@ -915 +915 @@
                 call_med->strm.a.stream)
             {
-                OnStreamDestroyedParam prm;
-                prm.stream = call_med->strm.a.stream;
-                prm.streamIdx = mi;
-    
-                onStreamDestroyed(prm);         
+                OnStreamDestroyedParam strm_prm;
+                strm_prm.stream = call_med->strm.a.stream;
+                strm_prm.streamIdx = mi;
+    
+                onStreamDestroyed(strm_prm);            
             }
         }