From: Martin Mares <mj@ucw.cz>
Date: Thu, 30 Jun 2005 23:17:22 +0000 (+0000)
Subject: Added stk_hexdump(). Very handy for debugging.
X-Git-Tag: holmes-import~761
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=512c07b430959e72f574e34cc2bd60b8e4672ad8;p=libucw.git

Added stk_hexdump(). Very handy for debugging.
---

diff --git a/lib/stkstring.c b/lib/stkstring.c
index 30cff4c8..a8593215 100644
--- a/lib/stkstring.c
+++ b/lib/stkstring.c
@@ -51,6 +51,18 @@ stk_printf_internal(char *fmt, ...)
     }
 }
 
+void
+stk_hexdump_internal(char *dst, byte *src, uns n)
+{
+  for (uns i=0; i<n; i++)
+    {
+      if (i)
+	*dst++ = ' ';
+      dst += sprintf(dst, "%02x", *src++);
+    }
+  *dst = 0;
+}
+
 #ifdef TEST
 
 int main(void)
@@ -62,6 +74,7 @@ int main(void)
   a = stk_strarraycat(arr, 2);
   a = stk_printf("Bew%s!", a);
   puts(a);
+  puts(stk_hexdump(a, 3));
   return 0;
 }
 
diff --git a/lib/stkstring.h b/lib/stkstring.h
index 03f68904..6337a26b 100644
--- a/lib/stkstring.h
+++ b/lib/stkstring.h
@@ -15,9 +15,11 @@
 #define stk_strmulticat(s...) ({ char *_s[]={s}; char *_x=alloca(stk_array_len(_s, ARRAY_SIZE(_s)-1)); stk_array_copy(_x, _s, ARRAY_SIZE(_s)-1); _x; })
 #define stk_strarraycat(s,n) ({ char **_s=(s); int _n=(n); char *_x=alloca(stk_array_len(_s,_n)); stk_array_copy(_x, _s, _n); _x; })
 #define stk_printf(f...) ({ uns _l=stk_printf_internal(f); char *_x=alloca(_l); memcpy(_x, stk_printf_buf, _l); _x; })
+#define stk_hexdump(s,n) ({ uns _n=(n); char *_x=alloca(3*_n+1); stk_hexdump_internal(_x,(byte*)(s),_n); _x; })
 
 uns stk_array_len(char **s, uns cnt);
 void stk_array_copy(char *x, char **s, uns cnt);
 uns stk_printf_internal(char *x, ...) FORMAT_CHECK(printf,1,2);
+void stk_hexdump_internal(char *dst, byte *src, uns n);
 
 extern char *stk_printf_buf;
diff --git a/lib/stkstring.t b/lib/stkstring.t
index 62f00477..9b1e7e50 100644
--- a/lib/stkstring.t
+++ b/lib/stkstring.t
@@ -2,3 +2,4 @@
 
 Run:	obj/lib/stkstring-t
 Out:	Beware the Jabberwock, my son!
+	42 65 77