Commit 6367dee9 authored by Kumar Kartikeya Dwivedi's avatar Kumar Kartikeya Dwivedi Committed by Greg Kroah-Hartman
Browse files

staging: most: Switch from strlcpy to strscpy 



strlcpy is marked as deprecated in Documentation/process/deprecated.rst,
and there is no functional difference when the caller expects truncation
(when not checking the return value). strscpy is relatively better as it
also avoids scanning the whole source string.

This silences the related checkpatch warnings from:
5dbdb2d8 ("checkpatch: prefer strscpy to strlcpy")

Signed-off-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20210131172838.146706-5-memxor@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a288a21e

drivers/staging/most/sound/sound.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static int audio_probe_channel(struct most_interface *iface, int channel_id, 
		pr_err("Incompatible channel type\n");

		return -EINVAL;

	}

	strlcpy(arg_list_cpy, arg_list, STRING_SIZE);

	strscpy(arg_list_cpy, arg_list, STRING_SIZE);

	ret = split_arg_list(arg_list_cpy, &ch_num, &sample_res);

	if (ret < 0)

		return ret;

drivers/staging/most/video/video.c

+3 −3
Original line number Diff line number Diff line
@@ -245,8 +245,8 @@ static int vidioc_querycap(struct file *file, void *priv, 
	struct comp_fh *fh = priv;

	struct most_video_dev *mdev = fh->mdev;



	strlcpy(cap->driver, "v4l2_component", sizeof(cap->driver));

	strlcpy(cap->card, "MOST", sizeof(cap->card));

	strscpy(cap->driver, "v4l2_component", sizeof(cap->driver));

	strscpy(cap->card, "MOST", sizeof(cap->card));

	snprintf(cap->bus_info, sizeof(cap->bus_info),

		 "%s", mdev->iface->description);

	return 0;
@@ -483,7 +483,7 @@ static int comp_probe_channel(struct most_interface *iface, int channel_idx, 
	mdev->v4l2_dev.release = comp_v4l2_dev_release;



	/* Create the v4l2_device */

	strlcpy(mdev->v4l2_dev.name, name, sizeof(mdev->v4l2_dev.name));

	strscpy(mdev->v4l2_dev.name, name, sizeof(mdev->v4l2_dev.name));

	ret = v4l2_device_register(NULL, &mdev->v4l2_dev);

	if (ret) {

		pr_err("v4l2_device_register() failed\n");