git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
media: use strscpy() instead of strlcpy()
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
platform
/
omap
/
omap_vout.c
diff --git
a/drivers/media/platform/omap/omap_vout.c
b/drivers/media/platform/omap/omap_vout.c
index 5700b7818621de4d91fa562e3515b2be09c8ba08..f447ae3bb465154922f7950a3f7fb9e2642f847d 100644
(file)
--- a/
drivers/media/platform/omap/omap_vout.c
+++ b/
drivers/media/platform/omap/omap_vout.c
@@
-1041,8
+1041,8
@@
static int vidioc_querycap(struct file *file, void *fh,
{
struct omap_vout_device *vout = fh;
{
struct omap_vout_device *vout = fh;
- str
l
cpy(cap->driver, VOUT_NAME, sizeof(cap->driver));
- str
l
cpy(cap->card, vout->vfd->name, sizeof(cap->card));
+ str
s
cpy(cap->driver, VOUT_NAME, sizeof(cap->driver));
+ str
s
cpy(cap->card, vout->vfd->name, sizeof(cap->card));
cap->bus_info[0] = '\0';
cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT |
V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
cap->bus_info[0] = '\0';
cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT |
V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
@@
-1060,8
+1060,8
@@
static int vidioc_enum_fmt_vid_out(struct file *file, void *fh,
return -EINVAL;
fmt->flags = omap_formats[index].flags;
return -EINVAL;
fmt->flags = omap_formats[index].flags;
- str
l
cpy(fmt->description, omap_formats[index].description,
-
sizeof(fmt->description));
+ str
s
cpy(fmt->description, omap_formats[index].description,
+ sizeof(fmt->description));
fmt->pixelformat = omap_formats[index].pixelformat;
return 0;
fmt->pixelformat = omap_formats[index].pixelformat;
return 0;
@@
-1868,7
+1868,7
@@
static int __init omap_vout_setup_video_data(struct omap_vout_device *vout)
vfd->release = video_device_release;
vfd->ioctl_ops = &vout_ioctl_ops;
vfd->release = video_device_release;
vfd->ioctl_ops = &vout_ioctl_ops;
- str
l
cpy(vfd->name, VOUT_NAME, sizeof(vfd->name));
+ str
s
cpy(vfd->name, VOUT_NAME, sizeof(vfd->name));
vfd->fops = &omap_vout_fops;
vfd->v4l2_dev = &vout->vid_dev->v4l2_dev;
vfd->fops = &omap_vout_fops;
vfd->v4l2_dev = &vout->vid_dev->v4l2_dev;