#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, ...)
+int obstack_vprintf(struct obstack *obst, const char *fmt, va_list ap)
{
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
} else {
break;
}
- buffer = malloc(buffer, size);
+ buffer = malloc(size);
}
obstack_grow(obst, buffer, len);
return len;
}
+
+int obstack_printf(struct obstack *obst, const char *fmt, ...)
+{
+ va_list ap;
+ int res;
+
+ va_start(ap, fmt);
+ res = obstack_vprintf(obst, fmt, ap);
+ va_end(ap);
+
+ return res;
+}