From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Wed, 31 Mar 2010 21:17:00 +0000 (+0400)
Subject: BR2979629: vsnprintf: Use nasm_malloc
X-Git-Tag: nasm-2.11.05~694
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cdcd1f7ac4ac9b60f8a6dd7327435997e478ebdd;p=platform%2Fupstream%2Fnasm.git

BR2979629: vsnprintf: Use nasm_malloc

There is no nasm_malloc_error helper anymore.
Use nasm_error instead.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---

diff --git a/lib/vsnprintf.c b/lib/vsnprintf.c
index 16d449c..bc54f94 100644
--- a/lib/vsnprintf.c
+++ b/lib/vsnprintf.c
@@ -23,17 +23,15 @@ 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);
+        nasm_error(ERR_PANIC|ERR_NOFILE,
+                   "vsnprintf: 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");
-    }
+    if (rv >= BUFFER_SIZE)
+        nasm_error(ERR_PANIC|ERR_NOFILE, "vsnprintf buffer overflow");
 
     if (size > 0) {
         if ((size_t)rv < size-1)