From 888690bee00281cc19eacc6af6a9680987975342 Mon Sep 17 00:00:00 2001 From: Antony Pavlov Date: Thu, 22 May 2014 09:20:04 +0400 Subject: [PATCH] vsprintf: fix formatting Signed-off-by: Antony Pavlov Signed-off-by: Sascha Hauer --- lib/vsprintf.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index c73db73e8..066338b4e 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -370,7 +370,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) /* get the precision */ precision = -1; if (*fmt == '.') { - ++fmt; + ++fmt; if (isdigit(*fmt)) precision = skip_atoi(&fmt); else if (*fmt == '*') { @@ -534,7 +534,8 @@ int vscnprintf(char *buf, size_t size, const char *fmt, va_list args) { int i; - i=vsnprintf(buf,size,fmt,args); + i = vsnprintf(buf, size, fmt, args); + return (i >= size) ? (size - 1) : i; } EXPORT_SYMBOL(vscnprintf); @@ -566,13 +567,13 @@ int sprintf(char * buf, const char *fmt, ...) int i; va_start(args, fmt); - i=vsprintf(buf,fmt,args); + i = vsprintf(buf, fmt, args); va_end(args); return i; } EXPORT_SYMBOL(sprintf); -int snprintf(char * buf, size_t size, const char *fmt, ...) +int snprintf(char *buf, size_t size, const char *fmt, ...) { va_list args; int i; @@ -620,7 +621,7 @@ EXPORT_SYMBOL(asprintf); void __noreturn panic(const char *fmt, ...) { - va_list args; + va_list args; va_start(args, fmt); vprintf(fmt, args); putchar('\n');