Use pkg-config to handle library dependencies.

[libucw.git] / lib / stkstring.c

diff --git a/lib/stkstring.c b/lib/stkstring.c
index eaeacf00f7c950aaf27de5aefa570bf58d395f6d..19c3a5dd8c2e0352cb864abd9886071fc605b1f4 100644 (file)
--- 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;
 }
 
   *x = 0;
 }
 

-char *stk_printf_buf;
-static int stk_printf_len;
-

 uns
 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);
   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);
   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)
       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;
        }
        {
          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
     }
 }
 
 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++)
     {
 {
   for (uns i=0; i<n; i++)
     {