X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fstkstring.c;h=19c3a5dd8c2e0352cb864abd9886071fc605b1f4;hb=580fd9c443c2a4faba5a703d49f366de5d3968c9;hp=eaeacf00f7c950aaf27de5aefa570bf58d395f6d;hpb=d49347a0fe4cdf22bb584bfef943a1290109f413;p=libucw.git

diff --git a/lib/stkstring.c b/lib/stkstring.c
index eaeacf00..19c3a5dd 100644
--- a/lib/stkstring.c
+++ b/lib/stkstring.c
@@ -27,39 +27,53 @@ stk_array_join(char *x, char **s, uns cnt, uns sep)
   *x = 0;
 }
 
-char *stk_printf_buf;
-static int stk_printf_len;
-
 uns
-stk_printf_internal(char *fmt, ...)
+stk_printf_internal(const char *fmt, ...)
 {
+  uns len = 256;
+  char *buf = alloca(len);
   va_list args, args2;
   va_start(args, fmt);
-  if (!stk_printf_buf)
+  for (;;)
     {
-      stk_printf_buf = xmalloc(256);
-      stk_printf_len = 256;
+      va_copy(args2, args);
+      int l = vsnprintf(buf, len, fmt, args2);
+      va_end(args2);
+      if (l < 0)
+	len *= 2;
+      else
+	{
+	  va_end(args);
+	  return l+1;
+	}
+      buf = alloca(len);
     }
+}
+
+uns
+stk_vprintf_internal(const char *fmt, va_list args)
+{
+  uns len = 256;
+  char *buf = alloca(len);
+  va_list args2;
   for (;;)
     {
       va_copy(args2, args);
-      int l = vsnprintf(stk_printf_buf, stk_printf_len, fmt, args2);
+      int l = vsnprintf(buf, len, fmt, args2);
       va_end(args2);
       if (l < 0)
-	stk_printf_len *= 2;
-      else if (l < stk_printf_len)
+	len *= 2;
+      else
 	{
 	  va_end(args);
 	  return l+1;
 	}
-      else
-	stk_printf_len = MAX(stk_printf_len*2, l+1);
-      stk_printf_buf = xrealloc(stk_printf_buf, stk_printf_len);
+      buf = alloca(len);
     }
 }
 
 void
-stk_hexdump_internal(char *dst, byte *src, uns n)
+stk_hexdump_internal(char *dst, const byte *src, uns n)
 {
   for (uns i=0; i<n; i++)
     {