X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fstk-charconv.c;h=3286f0fe301f64410bcb00413067b23b7afab3df;hb=39b28bffc195348b93294b5fa0a8b9e87ea7317a;hp=2dca1c56b7ba525a190f7fc1e60ef3950facbca1;hpb=ee58c363f2df512f649ac2837ee06c3cdbc75a03;p=libucw.git

diff --git a/charset/stk-charconv.c b/charset/stk-charconv.c
index 2dca1c56..3286f0fe 100644
--- a/charset/stk-charconv.c
+++ b/charset/stk-charconv.c
@@ -1,5 +1,5 @@
 /*
- *	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>
  *
@@ -7,15 +7,15 @@
  *	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_conv_init(struct conv_context *c, byte *s, uns in_cs, uns out_cs)
+stk_strconv_init(struct conv_context *c, const byte *s, uns in_cs, uns out_cs)
 {
   uns l = strlen(s);
   if (in_cs == out_cs)
@@ -35,7 +35,7 @@ stk_conv_init(struct conv_context *c, byte *s, uns in_cs, uns out_cs)
 }
 
 uns
-stk_conv_step(struct conv_context *c, byte *buf, uns len)
+stk_strconv_step(struct conv_context *c, byte *buf, uns len)
 {
   if (!c->source_end)
   {