Changeset 5654

Timestamp:

Sep 20, 2017 4:34:27 AM (7 years ago)

Author:

riza

Message:

Re #1994(misc): Fixed various warnings on VS2015.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/transport_udp.c (modified) (3 diffs)
• pjnath/src/pjnath/ice_session.c (modified) (2 diffs)
• pjsip-apps/src/pjsua/pjsua_app_cli.c (modified) (1 diff)
• pjsip/src/pjsua2/media.cpp (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

@@ -689 +689 @@
     rtcp_addr = (const pj_sockaddr*) rem_rtcp;
     if (rtcp_addr && pj_sockaddr_has_addr(rtcp_addr)) {
-        pj_status_t status;
-
         status = pj_sockaddr_synthesize(sock_addr.addr.sa_family,
                                         &remote_rtcp, rem_rtcp);
@@ -730 +728 @@
     {
         unsigned sobuf_size = PJMEDIA_TRANSPORT_SO_RCVBUF_SIZE;
-        pj_status_t status;
+        
         status = pj_sock_setsockopt_sobuf(udp->rtp_sock, pj_SO_RCVBUF(),
                                           PJ_TRUE, &sobuf_size);
@@ -750 +748 @@
     {
         unsigned sobuf_size = PJMEDIA_TRANSPORT_SO_SNDBUF_SIZE;
-        pj_status_t status;
+
         status = pj_sock_setsockopt_sobuf(udp->rtp_sock, pj_SO_SNDBUF(),
                                           PJ_TRUE, &sobuf_size);

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -2296 +2296 @@
          */
         pj_sockaddr synth_addr;
-        pj_status_t status;
         
         status = pj_sockaddr_synthesize(pj_AF_INET6(), &synth_addr,
@@ -2631 +2630 @@
              */
             for (i = 0; i < ice->rcand_cnt; ++i) {
-                pj_status_t status;
                 pj_sockaddr synth_addr;
             

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_cli.c

@@ -2591 +2591 @@
 static pj_status_t cmd_ip_change_handler(pj_cli_cmd_val *cval)
 {
-    pj_status_t status = PJ_SUCCESS;
     pjsua_ip_change_param param;
     PJ_UNUSED_ARG(cval);

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

@@ -1592 +1592 @@
     param.info.clock_rate = info.clockRate;
     param.info.channel_cnt = info.channelCnt;
-    param.info.avg_bps = info.avgBps;
-    param.info.max_bps= info.maxBps;
+    param.info.avg_bps = (pj_uint32_t)info.avgBps;
+    param.info.max_bps= (pj_uint32_t)info.maxBps;
     param.info.max_rx_frame_size = info.maxRxFrameSize;
-    param.info.frm_ptime = info.frameLen;
-    param.info.pcm_bits_per_sample = info.pcmBitsPerSample;
-    param.info.pt = info.pt;
+    param.info.frm_ptime = (pj_uint16_t)info.frameLen;
+    param.info.pcm_bits_per_sample = (pj_uint8_t)info.pcmBitsPerSample;
+    param.info.pt = (pj_uint8_t)info.pt;
     param.info.fmt_id = info.fmtId;
 
     /* setting part. */
-    param.setting.frm_per_pkt = setting.frmPerPkt;
+    param.setting.frm_per_pkt = (pj_uint8_t)setting.frmPerPkt;
     param.setting.vad = setting.vad;
     param.setting.cng = setting.cng;