X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fstkstring.h;h=2a310cad2ff6370559efb12d3d002432a9d8b229;hb=91c499892f07ad6494351a1c1985a0d3e2600a25;hp=e5cdc2603999230642088d8587f13723a1e8bc85;hpb=86897941a81703e1cbb14cbd3f4b3af1e3a1bcb8;p=libucw.git

diff --git a/lib/stkstring.h b/lib/stkstring.h
index e5cdc260..2a310cad 100644
--- a/lib/stkstring.h
+++ b/lib/stkstring.h
@@ -1,13 +1,16 @@
 /*
  *	UCW Library -- Strings Allocated on the Stack
  *
- *	(c) 2005--2006 Martin Mares <mj@ucw.cz>
+ *	(c) 2005--2007 Martin Mares <mj@ucw.cz>
  *	(c) 2005 Tomas Valla <tom@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
  */
 
+#ifndef _UCW_STKSTRING_H
+#define _UCW_STKSTRING_H
+
 #include <alloca.h>
 #include <string.h>
 #include <stdio.h>
@@ -20,11 +23,15 @@
 #define stk_strjoin(s,n,sep) ({ char **_s=(s); int _n=(n); char *_x=alloca(stk_array_len(_s,_n)+_n-1); stk_array_join(_x, _s, _n, (sep)); _x; })
 #define stk_printf(f...) ({ uns _l=stk_printf_internal(f); char *_x=alloca(_l); sprintf(_x, f); _x; })
 #define stk_vprintf(f, args) ({ uns _l=stk_vprintf_internal(f, args); char *_x=alloca(_l); vsprintf(_x, f, args); _x; })
-#define stk_hexdump(s,n) ({ uns _n=(n); char *_x=alloca(3*_n+1); stk_hexdump_internal(_x,(byte*)(s),_n); _x; })
-#define stk_str_unesc(s) ({ const byte *_s=(s); byte *_d=alloca(strlen(_s)+1); str_unesc(_d, _s); _d; })
+#define stk_hexdump(s,n) ({ uns _n=(n); char *_x=alloca(3*_n+1); stk_hexdump_internal(_x,(char*)(s),_n); _x; })
+#define stk_str_unesc(s) ({ const char *_s=(s); char *_d=alloca(strlen(_s)+1); str_unesc(_d, _s); _d; })
+#define stk_fsize(n) ({ char *_s=alloca(16); stk_fsize_internal(_s, n); _s; })
 
 uns stk_array_len(char **s, uns cnt);
 void stk_array_join(char *x, char **s, uns cnt, uns sep);
 uns stk_printf_internal(const char *x, ...) FORMAT_CHECK(printf,1,2);
 uns stk_vprintf_internal(const char *x, va_list args);
 void stk_hexdump_internal(char *dst, const byte *src, uns n);
+void stk_fsize_internal(char *dst, u64 size);
+
+#endif