Changeset 5813

Timestamp:

Jun 25, 2018 7:56:57 AM (6 years ago)

Author:

nanang

Message:

Misc (re #2059): Fixed various compile warnings on GCC 8.1 (thanks Alexander Traud for the report).

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/stream.c (modified) (2 diffs)
• pjnath/src/pjnath/ice_session.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -1219 +1219 @@
     pj_status_t status = 0;
     pjmedia_frame frame_out;
-    unsigned ts_len, rtp_ts_len, samples_per_frame;
+    unsigned ts_len, rtp_ts_len;
     void *rtphdr;
     int rtphdrlen;
@@ -1278 +1278 @@
     frame_out.buf = ((char*)channel->out_pkt) + sizeof(pjmedia_rtp_hdr);
     frame_out.size = 0;
-
-    /* Calculate number of samples per frame */
-    samples_per_frame = stream->enc_samples_per_pkt;
-
 
     /* If we have DTMF digits in the queue, transmit the digits.

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

@@ -2735 +2735 @@
     if (i == ice->rcand_cnt) {
         char raddr[PJ_INET6_ADDRSTRLEN];
+        void *p;
+
         if (ice->rcand_cnt >= PJ_ICE_MAX_CAND) {
             LOG4((ice->obj_name, 
@@ -2749 +2751 @@
 
         /* Foundation is random, unique from other foundation */
-        rcand->foundation.ptr = (char*) pj_pool_alloc(ice->pool, 36);
+        rcand->foundation.ptr = p = (char*) pj_pool_alloc(ice->pool, 36);
         rcand->foundation.slen = pj_ansi_snprintf(rcand->foundation.ptr, 36,
-                                                  "f%p", 
-                                                  rcand->foundation.ptr);
+                                                  "f%p", p);
 
         LOG4((ice->obj_name, 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -3536 +3536 @@
                 pjsip_regc_get_info(next_acc->regc, &tmp_regc_info);
                 if (transport == tmp_regc_info.transport) {
-                    char tmp_buf[PJSUA_MAX_ACC * 4];
-
-                    pj_ansi_strncpy(tmp_buf, acc_id, sizeof(acc_id));
-                    pj_ansi_snprintf(acc_id, sizeof(acc_id), "%s #%d", 
-                                     tmp_buf, j);
+                    char tmp_buf[4];
+
+                    pj_ansi_snprintf(tmp_buf, sizeof(tmp_buf), " #%d", j);
+                    if (pj_ansi_strlen(acc_id) + pj_ansi_strlen(tmp_buf) <
+                        sizeof(acc_id))
+                    {
+                        pj_ansi_strcat(acc_id, tmp_buf);
+                    }
+
                     shut_acc_ids[shut_acc_cnt++] = j;
                     if (!shutdown_transport) {
                         shutdown_transport =
-                                    next_acc->cfg.ip_change_cfg.shutdown_tp;                        
+                                    next_acc->cfg.ip_change_cfg.shutdown_tp;
                     }
                 }