X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fstk-charconv.c;h=e296c73bcfa04a8eec59c6fdb1df2f38fd60bd9b;hb=1bc3bb66e47ec02003658fb3040aef0ffd7b7540;hp=d5f55fed9e55a599a9e9e8e033ea79c5a8aa06a3;hpb=5d4c3f3f01730c49b82f9212749ce28f6f808658;p=libucw.git

diff --git a/charset/stk-charconv.c b/charset/stk-charconv.c
index d5f55fed..e296c73b 100644
--- a/charset/stk-charconv.c
+++ b/charset/stk-charconv.c
@@ -7,17 +7,17 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "lib/lib.h"
-#include "charset/stk-charconv.h"
+#include <ucw/lib.h>
+#include <charset/stk-charconv.h>
 #include <string.h>
 
 #define INITIAL_MIN_SIZE	16
 #define INITIAL_SCALE		2
 
-uns
-stk_strconv_init(struct conv_context *c, 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, 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;
   }