Skip to contentSkip to conversation

net: hns3: replace snprintf with scnprintf in hns3_update_strings

PATCH New Chen Zhou 1 participant 1 message Jan 20, 2020

Subsystems (4)
lore
Share & tools
lore

Chen Zhou

author
#0 lore raw

PATCH v2 1/1 net: hns3: replace snprintf with scnprintf in hns3_update_strings

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.

---

changes in v2:
- fix checkpatch style problem.

---
 drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +2 -3
index 6e0212b..c03856e 100644
@@ -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_",
-				      prefix, i);
-			n1 = min_t(uint, n1, MAX_PREFIX_SIZE - 1);
+			n1 = scnprintf(data, MAX_PREFIX_SIZE, "%s%d_",
+				       prefix, i);
 			size_left = (ETH_GSTRING_LEN - 1) - n1;
 
 			/* now, concatenate the stats string to it */
Signature · 1 line
2.7.4