X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fstk-charconv.c;h=e296c73bcfa04a8eec59c6fdb1df2f38fd60bd9b;hb=1bc3bb66e47ec02003658fb3040aef0ffd7b7540;hp=853bd9db03c06607c5ed68b588baead2df77269f;hpb=a4fe009d3366b0a3e119713b0ecc7fc0070efdfa;p=libucw.git diff --git a/charset/stk-charconv.c b/charset/stk-charconv.c index 853bd9db..e296c73b 100644 --- a/charset/stk-charconv.c +++ b/charset/stk-charconv.c @@ -7,17 +7,17 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "charset/stk-charconv.h" +#include +#include #include #define INITIAL_MIN_SIZE 16 #define INITIAL_SCALE 2 -uns -stk_strconv_init(struct conv_context *c, const byte *s, uns in_cs, uns out_cs) +uint +stk_strconv_init(struct conv_context *c, const byte *s, uint in_cs, uint out_cs) { - uns l = strlen(s); + uint l = strlen(s); if (in_cs == out_cs) { c->source = s; @@ -34,8 +34,8 @@ stk_strconv_init(struct conv_context *c, const byte *s, uns in_cs, uns out_cs) return l * INITIAL_SCALE + 1; } -uns -stk_strconv_step(struct conv_context *c, byte *buf, uns len) +uint +stk_strconv_step(struct conv_context *c, byte *buf, uint len) { if (!c->source_end) { @@ -45,7 +45,7 @@ stk_strconv_step(struct conv_context *c, byte *buf, uns len) } if (c->dest_start) { - uns l = c->dest_end - c->dest_start; + uint l = c->dest_end - c->dest_start; memcpy(buf, c->dest_start, l); c->dest = buf + l; }