Added s-fixint module (internal sorter for small fixed-size records).

[libucw.git] / lib / stkstring.c

diff --git a/lib/stkstring.c b/lib/stkstring.c
index eaeacf00f7c950aaf27de5aefa570bf58d395f6d..4fa5ab14ed551f5a7d5eebb87de49e78ed8ea1df 100644 (file)
--- a/lib/stkstring.c
+++ b/lib/stkstring.c
@@ -27,34 +27,26 @@ 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
 stk_printf_internal(char *fmt, ...)
 {
 uns
 stk_printf_internal(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)
-    {
-      stk_printf_buf = xmalloc(256);
-      stk_printf_len = 256;
-    }

   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);

     }
 }
 
     }
 }
 


@@ -70,6 +62,27 @@ stk_hexdump_internal(char *dst, byte *src, uns n)
   *dst = 0;
 }
 
   *dst = 0;
 }
 

+void
+stk_fsize_internal(char *buf, u64 x)
+{
+  if (x < 1<<10)
+    sprintf(buf, "%dB", (int)x);
+  else if (x < 10<<10)
+    sprintf(buf, "%.1fK", (double)x/(1<<10));
+  else if (x < 1<<20)
+    sprintf(buf, "%dK", (int)(x/(1<<10)));
+  else if (x < 10<<20)
+    sprintf(buf, "%.1fM", (double)x/(1<<20));
+  else if (x < 1<<30)
+    sprintf(buf, "%dM", (int)(x/(1<<20)));
+  else if (x < (u64)10<<30)
+    sprintf(buf, "%.1fG", (double)x/(1<<30));
+  else if (x != ~(u64)0)
+    sprintf(buf, "%dG", (int)(x/(1<<30)));
+  else
+    strcpy(buf, "unknown");
+}
+

 #ifdef TEST
 
 int main(void)
 #ifdef TEST
 
 int main(void)


@@ -84,6 +97,7 @@ int main(void)
   puts(stk_hexdump(a, 3));
   char *ary[] = { "The", "jaws", "that", "bite" };
   puts(stk_strjoin(ary, 4, ' '));
   puts(stk_hexdump(a, 3));
   char *ary[] = { "The", "jaws", "that", "bite" };
   puts(stk_strjoin(ary, 4, ' '));

+  puts(stk_fsize(1234567));

   return 0;
 }
 
   return 0;
 }