* [PATCH -next] net: hns3: replace snprintf with scnprintf in hns3_update_strings
@ 2020-01-19 12:40 Chen Zhou
2020-01-20 1:27 ` tanhuazhong
0 siblings, 1 reply; 3+ messages in thread
From: Chen Zhou @ 2020-01-19 12:40 UTC (permalink / raw)
To: yisen.zhuang, salil.mehta, davem; +Cc: netdev, linux-kernel, chenzhou10
snprintf returns the number of bytes that would be written, which may be
greater than the the actual length to be written. Here use extra code to
handle this.
scnprintf returns the number of bytes that was actually written, just use
scnprintf to simplify the code.
Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index 6e0212b..fa01888 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -423,9 +423,8 @@ static void *hns3_update_strings(u8 *data, const struct hns3_stats *stats,
data[ETH_GSTRING_LEN - 1] = '\0';
/* first, prepend the prefix string */
- n1 = snprintf(data, MAX_PREFIX_SIZE, "%s%d_",
+ n1 = scnprintf(data, MAX_PREFIX_SIZE, "%s%d_",
prefix, i);
- n1 = min_t(uint, n1, MAX_PREFIX_SIZE - 1);
size_left = (ETH_GSTRING_LEN - 1) - n1;
/* now, concatenate the stats string to it */
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH -next] net: hns3: replace snprintf with scnprintf in hns3_update_strings
2020-01-19 12:40 [PATCH -next] net: hns3: replace snprintf with scnprintf in hns3_update_strings Chen Zhou
@ 2020-01-20 1:27 ` tanhuazhong
2020-01-20 2:38 ` Chen Zhou
0 siblings, 1 reply; 3+ messages in thread
From: tanhuazhong @ 2020-01-20 1:27 UTC (permalink / raw)
To: Chen Zhou, yisen.zhuang, salil.mehta, davem; +Cc: netdev, linux-kernel
On 2020/1/19 20:40, Chen Zhou wrote:
> snprintf returns the number of bytes that would be written, which may be
> greater than the the actual length to be written. Here use extra code to
> handle this.
>
> scnprintf returns the number of bytes that was actually written, just use
> scnprintf to simplify the code.
>
> Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
> ---
> drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
> index 6e0212b..fa01888 100644
> --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
> @@ -423,9 +423,8 @@ static void *hns3_update_strings(u8 *data, const struct hns3_stats *stats,
> data[ETH_GSTRING_LEN - 1] = '\0';
>
> /* first, prepend the prefix string */
> - n1 = snprintf(data, MAX_PREFIX_SIZE, "%s%d_",
> + n1 = scnprintf(data, MAX_PREFIX_SIZE, "%s%d_",
> prefix, i);
not align?
> - n1 = min_t(uint, n1, MAX_PREFIX_SIZE - 1);
> size_left = (ETH_GSTRING_LEN - 1) - n1;
>
> /* now, concatenate the stats string to it */
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next] net: hns3: replace snprintf with scnprintf in hns3_update_strings
2020-01-20 1:27 ` tanhuazhong
@ 2020-01-20 2:38 ` Chen Zhou
0 siblings, 0 replies; 3+ messages in thread
From: Chen Zhou @ 2020-01-20 2:38 UTC (permalink / raw)
To: tanhuazhong, yisen.zhuang, salil.mehta, davem; +Cc: netdev, linux-kernel
On 2020/1/20 9:27, tanhuazhong wrote:
>
>
> On 2020/1/19 20:40, Chen Zhou wrote:
>> snprintf returns the number of bytes that would be written, which may be
>> greater than the the actual length to be written. Here use extra code to
>> handle this.
>>
>> scnprintf returns the number of bytes that was actually written, just use
>> scnprintf to simplify the code.
>>
>> Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
>> ---
>> drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
>> index 6e0212b..fa01888 100644
>> --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
>> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
>> @@ -423,9 +423,8 @@ static void *hns3_update_strings(u8 *data, const struct hns3_stats *stats,
>> data[ETH_GSTRING_LEN - 1] = '\0';
>> /* first, prepend the prefix string */
>> - n1 = snprintf(data, MAX_PREFIX_SIZE, "%s%d_",
>> + n1 = scnprintf(data, MAX_PREFIX_SIZE, "%s%d_",
>> prefix, i);
>
> not align?
Ok, I will fix it in next version.
Thanks,
Chen Zhou
>
>> - n1 = min_t(uint, n1, MAX_PREFIX_SIZE - 1);
>> size_left = (ETH_GSTRING_LEN - 1) - n1;
>> /* now, concatenate the stats string to it */
>>
>
>
> .
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-20 2:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-19 12:40 [PATCH -next] net: hns3: replace snprintf with scnprintf in hns3_update_strings Chen Zhou
2020-01-20 1:27 ` tanhuazhong
2020-01-20 2:38 ` Chen Zhou
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).