Changeset 5678

Timestamp:

Nov 1, 2017 4:55:29 AM (7 years ago)

Author:

riza

Message:

Re #2045 (misc): Fix various warning raised from using clang 4.0.1. Thanks to
Alexander Traud for the report.

Location:

pjproject/trunk

Files:

• pjlib/src/pj/ssl_sock_ossl.c (modified) (1 diff)
• pjmedia/src/pjmedia-audiodev/alsa_dev.c (modified) (1 diff)
• pjmedia/src/pjmedia/vid_codec_util.c (modified) (1 diff)
• pjmedia/src/pjmedia/vid_port.c (modified) (3 diffs)
• pjnath/src/pjnath/stun_sock.c (modified) (1 diff)
• pjsip/src/test/regc_test.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -99 +99 @@
     }
     return cid;
-};
+}
 
 static unsigned get_nid_from_cid(unsigned cid)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/alsa_dev.c

@@ -938 +938 @@
     struct alsa_factory *af = ((struct alsa_stream*)strm)->af;
 
-    if (cap==PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING && af->pb_mixer_name) {
+    if (cap==PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING && 
+        pj_ansi_strlen(af->pb_mixer_name)) 
+    {
         pj_ssize_t min, max;
         snd_mixer_t *handle;

pjproject/trunk/pjmedia/src/pjmedia/vid_codec_util.c

@@ -174 +174 @@
 
     return mpi;
-};
+}
 
 PJ_DEF(pj_status_t) pjmedia_vid_codec_h263_apply_fmtp(

pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

@@ -483 +483 @@
     pjmedia_vid_port *vp;
     pjmedia_video_format_detail *vfd;
-    char dev_name[64];
     char fmt_name[5];
     pjmedia_vid_dev_cb vid_cb;
@@ -491 +490 @@
     pjmedia_vid_dev_param vparam;
     pjmedia_vid_dev_info di;
+    char dev_name[sizeof(di.name) + sizeof(di.driver) + 4];
 
     PJ_ASSERT_RETURN(pool && prm && p_vid_port, PJ_EINVAL);
@@ -523 +523 @@
     dev_name[0] = '\0';
 
-    pj_ansi_snprintf(dev_name, sizeof(dev_name), "%s [%s]",
-                     di.name, di.driver);
+    pj_ansi_snprintf(dev_name, sizeof(dev_name), "%s [%s]", di.name, di.driver);
     pjmedia_fourcc_name(vparam.fmt.id, fmt_name);
     PJ_LOG(4,(THIS_FILE,

pjproject/trunk/pjnath/src/pjnath/stun_sock.c

@@ -137 +137 @@
 
     return op < PJ_ARRAY_SIZE(names) ? names[op] : "???";
-};
+}
 
 

pjproject/trunk/pjsip/src/test/regc_test.c

@@ -65 +65 @@
     else
         return PJ_SUCCESS;
-};
+}
 
 
@@ -526 +526 @@
 
     return PJ_SUCCESS;
-};
+}
 
 
@@ -701 +701 @@
     pjsip_regc_destroy(regc);
     return ret;
-};
+}
 
 
@@ -732 +732 @@
 
     return ret;
-};
+}