| Message ID | 20230923152107.283289-20-hverkuil-cisco@xs4all.nl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: fix all string truncate warnings | expand |
On 23/09/2023 at 17:21, Hans Verkuil wrote: > Let the V4L2 core fill this in. > > Fixes this warning: > > drivers/staging/media/deprecated/atmel/atmel-isc-base.c: In function 'isc_querycap': > drivers/staging/media/deprecated/atmel/atmel-isc-base.c:496:28: warning: '%s' directive output may be truncated writing up to 35 bytes into a region of size 23 [-Wformat-truncation=] > 496 | "platform:%s", isc->v4l2_dev.name); > | ^~ > drivers/staging/media/deprecated/atmel/atmel-isc-base.c:495:9: note: 'snprintf' output between 10 and 45 bytes into a destination of size 32 > 495 | snprintf(cap->bus_info, sizeof(cap->bus_info), > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 496 | "platform:%s", isc->v4l2_dev.name); > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> > Cc: Eugen Hristev <eugen.hristev@collabora.com> > Cc: Nicolas Ferre <nicolas.ferre@microchip.com> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Thanks Hans for having take care of this for ISI and ISC. Best regards, Nicolas > --- > drivers/staging/media/deprecated/atmel/atmel-isc-base.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/staging/media/deprecated/atmel/atmel-isc-base.c b/drivers/staging/media/deprecated/atmel/atmel-isc-base.c > index f5d963904201..8e26663cecb6 100644 > --- a/drivers/staging/media/deprecated/atmel/atmel-isc-base.c > +++ b/drivers/staging/media/deprecated/atmel/atmel-isc-base.c > @@ -488,12 +488,8 @@ static const struct vb2_ops isc_vb2_ops = { > static int isc_querycap(struct file *file, void *priv, > struct v4l2_capability *cap) > { > - struct isc_device *isc = video_drvdata(file); > - > strscpy(cap->driver, "microchip-isc", sizeof(cap->driver)); > strscpy(cap->card, "Atmel Image Sensor Controller", sizeof(cap->card)); > - snprintf(cap->bus_info, sizeof(cap->bus_info), > - "platform:%s", isc->v4l2_dev.name); > > return 0; > } > -- > 2.40.1 >
diff --git a/drivers/staging/media/deprecated/atmel/atmel-isc-base.c b/drivers/staging/media/deprecated/atmel/atmel-isc-base.c index f5d963904201..8e26663cecb6 100644 --- a/drivers/staging/media/deprecated/atmel/atmel-isc-base.c +++ b/drivers/staging/media/deprecated/atmel/atmel-isc-base.c @@ -488,12 +488,8 @@ static const struct vb2_ops isc_vb2_ops = { static int isc_querycap(struct file *file, void *priv, struct v4l2_capability *cap) { - struct isc_device *isc = video_drvdata(file); - strscpy(cap->driver, "microchip-isc", sizeof(cap->driver)); strscpy(cap->card, "Atmel Image Sensor Controller", sizeof(cap->card)); - snprintf(cap->bus_info, sizeof(cap->bus_info), - "platform:%s", isc->v4l2_dev.name); return 0; }
Let the V4L2 core fill this in. Fixes this warning: drivers/staging/media/deprecated/atmel/atmel-isc-base.c: In function 'isc_querycap': drivers/staging/media/deprecated/atmel/atmel-isc-base.c:496:28: warning: '%s' directive output may be truncated writing up to 35 bytes into a region of size 23 [-Wformat-truncation=] 496 | "platform:%s", isc->v4l2_dev.name); | ^~ drivers/staging/media/deprecated/atmel/atmel-isc-base.c:495:9: note: 'snprintf' output between 10 and 45 bytes into a destination of size 32 495 | snprintf(cap->bus_info, sizeof(cap->bus_info), | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 496 | "platform:%s", isc->v4l2_dev.name); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Cc: Eugen Hristev <eugen.hristev@collabora.com> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> --- drivers/staging/media/deprecated/atmel/atmel-isc-base.c | 4 ---- 1 file changed, 4 deletions(-)