OSDN Git Service

media: imx: fix compiler warning
authorHans Verkuil <hans.verkuil@cisco.com>
Mon, 14 May 2018 13:01:25 +0000 (09:01 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 25 May 2018 19:33:14 +0000 (15:33 -0400)
drivers/staging/media/imx/imx-media-capture.c: In function 'vidioc_querycap':
drivers/staging/media/imx/imx-media-capture.c:76:2: warning: 'strncpy' output truncated copying 15 bytes from a string of length 17 [-Wstringop-truncation]
  strncpy(cap->driver, "imx-media-capture", sizeof(cap->driver) - 1);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Steve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/staging/media/imx/imx-media-capture.c

index 0ccabe0..4e3fdf8 100644 (file)
@@ -73,8 +73,8 @@ static int vidioc_querycap(struct file *file, void *fh,
 {
        struct capture_priv *priv = video_drvdata(file);
 
-       strncpy(cap->driver, "imx-media-capture", sizeof(cap->driver) - 1);
-       strncpy(cap->card, "imx-media-capture", sizeof(cap->card) - 1);
+       strlcpy(cap->driver, "imx-media-capture", sizeof(cap->driver));
+       strlcpy(cap->card, "imx-media-capture", sizeof(cap->card));
        snprintf(cap->bus_info, sizeof(cap->bus_info),
                 "platform:%s", priv->src_sd->name);