Changeset 5678 for pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

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.

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_port.c (modified) (3 diffs)

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,