Format string cleanup.

[libucw.git] / charset / stk-charconv.h

diff --git a/charset/stk-charconv.h b/charset/stk-charconv.h
index d8ae585c4fefa91d9e570ed77090bad63f002792..3b47940f317d63ce7f99e943b3512835d26cccbd 100644 (file)
--- a/charset/stk-charconv.h
+++ b/charset/stk-charconv.h
@@ -1,7 +1,10 @@
 /*
 /*

- *     Sherlock Library -- Character Conversion with Allocation on the Stack 
+ *     Sherlock Library -- Character Conversion with Allocation on the Stack

  *
  *     (c) 2006 Pavel Charvat <pchar@ucw.cz>
  *
  *     (c) 2006 Pavel Charvat <pchar@ucw.cz>

+ *
+ *     This software may be freely distributed and used according to the terms
+ *     of the GNU Lesser General Public License.

  */
 
 #ifndef _CHARSET_STK_CHARCONV_H
  */
 
 #ifndef _CHARSET_STK_CHARCONV_H


@@ -12,25 +15,16 @@
 
 /* The following macros convert strings between given charsets (CONV_CHARSET_x). */
 
 
 /* The following macros convert strings between given charsets (CONV_CHARSET_x). */
 

-#define stk_conv(s, cs_in, cs_out) \
-    ({ struct stk_conv_context _c; stk_conv_init(&_c, (s), (cs_in), (cs_out)); \
-       while (stk_conv_step(&_c, alloca(_c.request))); _c.c.dest_start; })
-
-#define stk_conv_to_utf8(s, cs_in) stk_conv(s, cs_in, CONV_CHARSET_UTF8)
-#define stk_conv_from_utf8(s, cs_out) stk_conv(s, CONV_CHARSET_UTF8, cs_out)
-   
-/* Internal structure and routines. */
-
-struct stk_conv_context {
-  struct conv_context c;
-  uns count;
-  uns sum;
-  uns request;
-  byte *buf[16]; 
-  uns size[16];
-};
-
-void stk_conv_init(struct stk_conv_context *c, byte *s, uns cs_in, uns cs_out);
-int stk_conv_step(struct stk_conv_context *c, byte *buf);
+#define stk_strconv(s, cs_in, cs_out) \
+    ({ struct conv_context _c; uns _l=stk_strconv_init(&_c, (s), (cs_in), (cs_out)); \
+       while (_l) _l=stk_strconv_step(&_c, alloca(_l), _l); _c.dest_start; })
+
+#define stk_strconv_to_utf8(s, cs_in) stk_strconv(s, cs_in, CONV_CHARSET_UTF8)
+#define stk_strconv_from_utf8(s, cs_out) stk_strconv(s, CONV_CHARSET_UTF8, cs_out)
+
+/* Internals */
+
+uns stk_strconv_init(struct conv_context *c, byte *s, uns cs_in, uns cs_out);
+uns stk_strconv_step(struct conv_context *c, byte *buf, uns len);

 
 #endif
 
 #endif