From 5d269789a54d43e4d210438fd32b01fa743100e0 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Thu, 1 Apr 2010 01:09:35 +0400 Subject: [PATCH] vsnprintf: Style nitfix Signed-off-by: Cyrill Gorcunov --- lib/vsnprintf.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/lib/vsnprintf.c b/lib/vsnprintf.c index f5ae2feb..16d449cf 100644 --- a/lib/vsnprintf.c +++ b/lib/vsnprintf.c @@ -14,7 +14,7 @@ #include "nasmlib.h" -#define BUFFER_SIZE 65536 /* Bigger than any string we might print... */ +#define BUFFER_SIZE 65536 /* Bigger than any string we might print... */ static char snprintf_buffer[BUFFER_SIZE]; @@ -23,26 +23,25 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap) int rv, bytes; if (size > BUFFER_SIZE) { - nasm_malloc_error(ERR_PANIC|ERR_NOFILE, - "snprintf: size (%d) > BUFFER_SIZE (%d)", - size, BUFFER_SIZE); - size = BUFFER_SIZE; + nasm_malloc_error(ERR_PANIC|ERR_NOFILE, + "snprintf: size (%d) > BUFFER_SIZE (%d)", + size, BUFFER_SIZE); + size = BUFFER_SIZE; } rv = vsprintf(snprintf_buffer, format, ap); if (rv >= BUFFER_SIZE) { - nasm_malloc_error(ERR_PANIC|ERR_NOFILE, - "snprintf buffer overflow"); + nasm_malloc_error(ERR_PANIC|ERR_NOFILE, + "snprintf buffer overflow"); } if (size > 0) { - if ((size_t)rv < size-1) - bytes = rv; - else - bytes = size-1; - - memcpy(str, snprintf_buffer, bytes); - str[bytes] = '\0'; + if ((size_t)rv < size-1) + bytes = rv; + else + bytes = size-1; + memcpy(str, snprintf_buffer, bytes); + str[bytes] = '\0'; } return rv;