UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: qlge/qlge_ethtool.c: 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:
5dbdb2d87c ("checkpatch: prefer strscpy to strlcpy")

Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20210130044828.121248-1-memxor@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kumar Kartikeya Dwivedi 2021-01-30 10:18:28 +05:30 committed by Greg Kroah-Hartman
parent 6ee9e6ee5c
commit 5aadd5c692
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/qlge/qlge_ethtool.c
View File

@ -415,15 +415,15 @@ static void qlge_get_drvinfo(struct net_device *ndev,
{ {
struct qlge_adapter *qdev = netdev_to_qdev(ndev); struct qlge_adapter *qdev = netdev_to_qdev(ndev);
strlcpy(drvinfo->driver, qlge_driver_name, sizeof(drvinfo->driver)); strscpy(drvinfo->driver, qlge_driver_name, sizeof(drvinfo->driver));
strlcpy(drvinfo->version, qlge_driver_version, strscpy(drvinfo->version, qlge_driver_version,
sizeof(drvinfo->version)); sizeof(drvinfo->version));
snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
"v%d.%d.%d", "v%d.%d.%d",
(qdev->fw_rev_id & 0x00ff0000) >> 16, (qdev->fw_rev_id & 0x00ff0000) >> 16,
(qdev->fw_rev_id & 0x0000ff00) >> 8, (qdev->fw_rev_id & 0x0000ff00) >> 8,
(qdev->fw_rev_id & 0x000000ff)); (qdev->fw_rev_id & 0x000000ff));
strlcpy(drvinfo->bus_info, pci_name(qdev->pdev), strscpy(drvinfo->bus_info, pci_name(qdev->pdev),
sizeof(drvinfo->bus_info)); sizeof(drvinfo->bus_info));
} }