X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fobstack%2Fobstack_printf.c;h=7ade5ef138b363adc88f4b58b7d92addab2b9cce;hb=d5d7159c209a9e5c5fa276f770b5b28a217990a8;hp=ab494bb99ab2e9fbf2b7d01e8d7b0e3d65c9f3ee;hpb=53c740e61018fc1172d2c290a486251efd4e906b;p=libfirm

diff --git a/ir/obstack/obstack_printf.c b/ir/obstack/obstack_printf.c
index ab494bb99..7ade5ef13 100644
--- a/ir/obstack/obstack_printf.c
+++ b/ir/obstack/obstack_printf.c
@@ -1,24 +1,30 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
 #include "obstack.h"
 
 #ifdef _WIN32
-#define vsnprintf _vsnprintf
-#endif
-
-int obstack_printf(struct obstack *obst, const char *fmt, ...)
+/* win32/C89 has no va_copy function... so we have to use the stupid fixed-length version */
+int obstack_vprintf(struct obstack *obst, const char *fmt, va_list ap) FIRM_NOTHROW
+{
+	char buf[16384];
+	int len = _vsnprintf(buf, sizeof(buf), fmt, ap);
+	obstack_grow(obst, buf, len);
+	return len;
+}
+#else
+int obstack_vprintf(struct obstack *obst, const char *fmt, va_list ap) FIRM_NOTHROW
 {
 	char    buf[128];
 	char   *buffer = buf;
-	size_t  size   = lengthof(buf);
-	va_list ap;
+	size_t  size   = sizeof(buf);
 	int     len;
 
 	for (;;) {
-		va_start(ap, fmt);
-		len = vsnprintf(buffer, sizeof(buffer), fmt, ap);
-		va_end(ap);
+		va_list tap;
+		va_copy(tap, ap);
+		len = vsnprintf(buffer, size, fmt, tap);
 
 		/* snprintf should return -1 only in the error case, but older glibcs
 		 * and probably other systems are buggy in this respect and return -1 if
@@ -37,7 +43,7 @@ int obstack_printf(struct obstack *obst, const char *fmt, ...)
 		} else {
 			break;
 		}
-		buffer = malloc(buffer, size);
+		buffer = (char*)malloc(size);
 	}
 
 	obstack_grow(obst, buffer, len);
@@ -46,3 +52,16 @@ int obstack_printf(struct obstack *obst, const char *fmt, ...)
 
 	return len;
 }
+#endif
+
+int obstack_printf(struct obstack *obst, const char *fmt, ...) FIRM_NOTHROW
+{
+	va_list ap;
+	int     res;
+
+	va_start(ap, fmt);
+	res = obstack_vprintf(obst, fmt, ap);
+	va_end(ap);
+
+	return res;
+}