Skip to contentSkip to conversation

ALSA: jack: use scnprintf to improve parse_mask_bits

PATCH Applied Thorsten Blum 2 participants 2 messages May 3 – May 4 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: jack: use scnprintf to improve parse_mask_bits

Use the return value of scnprintf() to keep track of the current string length and also replace strlcat() with scnprintf(). Return the string length directly instead of calling strlen(buf).

---
 sound/core/jack.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
sound/core/jack.c +5 -8
index 5e8a2f3f4196..96e0733ede77 100644
@@ -250,18 +250,15 @@ static const char * const jack_events_name[] = {
 /* the recommended buffer size is 256 */
 static int parse_mask_bits(unsigned int mask_bits, char *buf, size_t buf_size)
 {
+	int len = scnprintf(buf, buf_size, "0x%04x", mask_bits);
 	int i;
 
-	scnprintf(buf, buf_size, "0x%04x", mask_bits);
-
 	for (i = 0; i < ARRAY_SIZE(jack_events_name); i++)
-		if (mask_bits & (1 << i)) {
-			strlcat(buf, " ", buf_size);
-			strlcat(buf, jack_events_name[i], buf_size);
-		}
-	strlcat(buf, "\n", buf_size);
+		if (mask_bits & (1 << i))
+			len += scnprintf(buf + len, buf_size - len, " %s", jack_events_name[i]);
+	len += scnprintf(buf + len, buf_size - len, "\n");
 
-	return strlen(buf);
+	return len;
 }
 
 static ssize_t jack_kctl_mask_bits_read(struct file *file,
Applied
#1 lore raw
Quoted 6 lines · Thorsten Blum

Use the return value of scnprintf() to keep track of the current string length and also replace strlcat() with scnprintf(). Return the string length directly instead of calling strlen(buf).

Thanks, applied now.

Takashi