This series converts all existing users of strlcpy in drivers/staging to use
strscpy instead.
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")
The conversions were performed in two steps:
1. The following coccinelle script was used to identify and replace call sites
that expect truncation.
$ spatch --sp-file strscpy.cocci --include-headers --dir --in-place drivers/staging
@strscpy@
expression dest, src, size;
@@
-strlcpy(dest, src, size);
+strscpy(dest, src, size);
2. Each individual automated conversion was rechecked manually for correctness.
Kumar Kartikeya Dwivedi (13):
staging: comedi: Switch from strlcpy to strscpy
staging: greybus: Switch from strlcpy to strscpy
staging: fsl-dpaa2: Switch from strlcpy to strscpy
staging: most: Switch from strlcpy to strscpy
staging: nvec: Switch from strlcpy to strscpy
staging: octeon: Switch from strlcpy to strscpy
staging: olpc_dcon: Switch from strlcpy to strscpy
staging: rtl8188eu: Switch from strlcpy to strscpy
staging: rtl8192e: Switch from strlcpy to strscpy
staging: rtl8192u: Switch from strlcpy to strscpy
staging: rtl8712: Switch from strlcpy to strscpy
staging: sm750fb: Switch from strlcpy to strscpy
staging: wimax: Switch from strlcpy to strscpy
drivers/staging/comedi/comedi_fops.c | 4 ++--
drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c | 6 +++---
drivers/staging/greybus/audio_helper.c | 2 +-
drivers/staging/greybus/audio_module.c | 2 +-
drivers/staging/greybus/audio_topology.c | 6 +++---
drivers/staging/greybus/power_supply.c | 2 +-
drivers/staging/greybus/spilib.c | 4 ++--
drivers/staging/most/sound/sound.c | 2 +-
drivers/staging/most/video/video.c | 6 +++---
drivers/staging/nvec/nvec_ps2.c | 4 ++--
drivers/staging/octeon/ethernet-mdio.c | 6 +++---
drivers/staging/olpc_dcon/olpc_dcon.c | 2 +-
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +-
drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c | 6 +++---
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +-
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 +-
drivers/staging/sm750fb/sm750.c | 2 +-
drivers/staging/wimax/i2400m/netdev.c | 6 +++---
drivers/staging/wimax/i2400m/usb.c | 4 ++--
19 files changed, 35 insertions(+), 35 deletions(-)
--
2.29.2
Fixed the spelling of 'transfered' to 'transferred'.
Signed-off-by: Pritthijit Nath <pritthijit.nath(a)icloud.com>
---
Fixed the typo in 'transferred' which crept in last time.
drivers/staging/greybus/hid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c
index a56c3fb5d35a..adb91286803a 100644
--- a/drivers/staging/greybus/hid.c
+++ b/drivers/staging/greybus/hid.c
@@ -254,7 +254,7 @@ static int __gb_hid_output_raw_report(struct hid_device *hid, __u8 *buf,
ret = gb_hid_set_report(ghid, report_type, report_id, buf, len);
if (report_id && ret >= 0)
- ret++; /* add report_id to the number of transfered bytes */
+ ret++; /* add report_id to the number of transferred bytes */
return 0;
}
--
2.25.1
Fixed the spelling of 'transfered' to 'transferred'.
Signed-off-by: Pritthijit Nath <pritthijit.nath(a)icloud.com>
---
Fixed the typo in the patch which was meant to fix that very typo.
Really sorry for last time.
Hope this does not have any other typo.
drivers/staging/greybus/hid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c
index a56c3fb5d35a..adb91286803a 100644
--- a/drivers/staging/greybus/hid.c
+++ b/drivers/staging/greybus/hid.c
@@ -254,7 +254,7 @@ static int __gb_hid_output_raw_report(struct hid_device *hid, __u8 *buf,
ret = gb_hid_set_report(ghid, report_type, report_id, buf, len);
if (report_id && ret >= 0)
- ret++; /* add report_id to the number of transfered bytes */
+ ret++; /* add report_id to the number of transferred bytes */
return 0;
}
--
2.25.1
Hi,
I have a coding style fix in greybus subsystem.
By the way, I'm following the Eudyptula Challenge Linux kernel tasks and
this patch is related to my task no 10. I hope I'm doing it the right way.
Thanks for your understanding and kind comments.
Fatih YILDIRIM (1):
Macros with multiple statements should be enclosed in a do - while
loop.
drivers/staging/greybus/loopback.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
--
2.20.1