samples: Replace strlcpy() with strscpy()

[linux-2.6-microblaze.git] / samples / v4l / v4l2-pci-skeleton.c

diff --git a/samples/v4l/v4l2-pci-skeleton.c b/samples/v4l/v4l2-pci-skeleton.c
index a61f94d..69ef788 100644 (file)
--- a/samples/v4l/v4l2-pci-skeleton.c
+++ b/samples/v4l/v4l2-pci-skeleton.c
@@ -291,8 +291,8 @@ static int skeleton_querycap(struct file *file, void *priv,
 {
        struct skeleton *skel = video_drvdata(file);
 
-       strlcpy(cap->driver, KBUILD_MODNAME, sizeof(cap->driver));
-       strlcpy(cap->card, "V4L2 PCI Skeleton", sizeof(cap->card));
+       strscpy(cap->driver, KBUILD_MODNAME, sizeof(cap->driver));
+       strscpy(cap->card, "V4L2 PCI Skeleton", sizeof(cap->card));
        snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s",
                 pci_name(skel->pdev));
        return 0;
@@ -597,11 +597,11 @@ static int skeleton_enum_input(struct file *file, void *priv,
        i->type = V4L2_INPUT_TYPE_CAMERA;
        if (i->index == 0) {
                i->std = SKEL_TVNORMS;
-               strlcpy(i->name, "S-Video", sizeof(i->name));
+               strscpy(i->name, "S-Video", sizeof(i->name));
                i->capabilities = V4L2_IN_CAP_STD;
        } else {
                i->std = 0;
-               strlcpy(i->name, "HDMI", sizeof(i->name));
+               strscpy(i->name, "HDMI", sizeof(i->name));
                i->capabilities = V4L2_IN_CAP_DV_TIMINGS;
        }
        return 0;
@@ -845,7 +845,7 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        /* Initialize the video_device structure */
        vdev = &skel->vdev;
-       strlcpy(vdev->name, KBUILD_MODNAME, sizeof(vdev->name));
+       strscpy(vdev->name, KBUILD_MODNAME, sizeof(vdev->name));
        /*
         * There is nothing to clean up, so release is set to an empty release
         * function. The release callback must be non-NULL.