Skip to contentSkip to conversation

lib: fix vscnprintf() if @size is == 0

PATCH In review Anton Arapov 2 participants 2 messages Dec 13, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib: fix vscnprintf() if @size is == 0

vscnprintf() should return 0 if @size is == 0. Update the comment for it, as @size is unsigned.

This change based on the code of commit b903c0b8899b46829a9b80ba55b61079b35940ec moves the real fix into vscnprinf() from scnprintf() and makes scnprintf() call vscnprintf(), thus avoid code duplication.

---
 lib/vsprintf.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
lib/vsprintf.c +8 -8
index c150d3d..85e6b27 100644
@@ -1451,7 +1451,7 @@ EXPORT_SYMBOL(vsnprintf);
  * @args: Arguments for the format string
  *
  * The return value is the number of characters which have been written into
- * the @buf not including the trailing '\0'. If @size is <= 0 the function
+ * the @buf not including the trailing '\0'. If @size is == 0 the function
  * returns 0.
  *
  * Call this function if you are already dealing with a va_list.
@@ -1465,7 +1465,11 @@ int vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
 
 	i = vsnprintf(buf, size, fmt, args);
 
-	return (i >= size) ? (size - 1) : i;
+	if (likely(i < size))
+		return i;
+	if (size != 0)
+		return size - 1;
+	return 0;
 }
 EXPORT_SYMBOL(vscnprintf);
 
@@ -1513,14 +1517,10 @@ int scnprintf(char *buf, size_t size, const char *fmt, ...)
 	int i;
 
 	va_start(args, fmt);
-	i = vsnprintf(buf, size, fmt, args);
+	i = vscnprintf(buf, size, fmt, args);
 	va_end(args);
 
-	if (likely(i < size))
-		return i;
-	if (size != 0)
-		return size - 1;
-	return 0;
+	return i;
 }
 EXPORT_SYMBOL(scnprintf);
 
Signature · 1 line
1.7.1
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Anton Arapov

vscnprintf() should return 0 if @size is == 0. Update the comment for it, as @size is unsigned.

This change based on the code of commit b903c0b8899b46829a9b80ba55b61079b35940ec moves the real fix into vscnprinf() from scnprintf() and makes scnprintf() call vscnprintf(), thus avoid code duplication.

Signature · 2 lines
Regards,
Changli Gao([email protected])