diff mbox series

[05/13] staging: nvec: Switch from strlcpy to strscpy

Message ID 20210131172838.146706-6-memxor@gmail.com
State Rejected
Headers show
Series Convert all users of strlcpy to strscpy | expand

Commit Message

Kumar Kartikeya Dwivedi Jan. 31, 2021, 5:28 p.m. UTC
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:
5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")

Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
---
 drivers/staging/nvec/nvec_ps2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Marc Dietrich Feb. 3, 2021, 11:09 a.m. UTC | #1
Hi Kumar,

On Sun, 31 Jan 2021, Kumar Kartikeya Dwivedi wrote:

> 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:
> 5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
>
> Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
> ---
> drivers/staging/nvec/nvec_ps2.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c
> index 45db29262..157009015 100644
> --- a/drivers/staging/nvec/nvec_ps2.c
> +++ b/drivers/staging/nvec/nvec_ps2.c
> @@ -112,8 +112,8 @@ static int nvec_mouse_probe(struct platform_device *pdev)
> 	ser_dev->start = ps2_startstreaming;
> 	ser_dev->stop = ps2_stopstreaming;
>
> -	strlcpy(ser_dev->name, "nvec mouse", sizeof(ser_dev->name));
> -	strlcpy(ser_dev->phys, "nvec", sizeof(ser_dev->phys));
> +	strscpy(ser_dev->name, "nvec mouse", sizeof(ser_dev->name));
> +	strscpy(ser_dev->phys, "nvec", sizeof(ser_dev->phys));

lgtm, so

Acked-by: Marc Dietrich <marvin24@gmx.de>

Thanks!

Marc
diff mbox series

Patch

diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c
index 45db29262..157009015 100644
--- a/drivers/staging/nvec/nvec_ps2.c
+++ b/drivers/staging/nvec/nvec_ps2.c
@@ -112,8 +112,8 @@  static int nvec_mouse_probe(struct platform_device *pdev)
 	ser_dev->start = ps2_startstreaming;
 	ser_dev->stop = ps2_stopstreaming;
 
-	strlcpy(ser_dev->name, "nvec mouse", sizeof(ser_dev->name));
-	strlcpy(ser_dev->phys, "nvec", sizeof(ser_dev->phys));
+	strscpy(ser_dev->name, "nvec mouse", sizeof(ser_dev->name));
+	strscpy(ser_dev->phys, "nvec", sizeof(ser_dev->phys));
 
 	ps2_dev.ser_dev = ser_dev;
 	ps2_dev.notifier.notifier_call = nvec_ps2_notifier;