X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fmp-charconv.h;h=f33cd373e590620a7ceb9e6051d3b166fc89952c;hb=67d52e562eaeef76ee6c5d9f8ca2da573e825506;hp=6519535a38504bdf86d5ad10adb542119cc39b91;hpb=7af80cdb684884505ceeb2d71414b2b9c24ab02b;p=libucw.git

diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h
index 6519535a..f33cd373 100644
--- a/charset/mp-charconv.h
+++ b/charset/mp-charconv.h
@@ -1,24 +1,26 @@
 /*
- *	Sherlock Library -- Character Conversion with Allocation on a Memory Pool 
+ *	Sherlock Library -- Character Conversion with Allocation on a Memory Pool
  *
  *	(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 _MP_CHARCONV_H
-#define _MP_CHARCONV_H
+#ifndef _CHARSET_MP_CHARCONV_H
+#define _CHARSET_MP_CHARCONV_H
 
 #include "lib/mempool.h"
 #include "charset/charconv.h"
 
-byte *
-mp_conv(struct mempool *mp, byte *s, uns cs_in, uns cs_out);
+byte *mp_strconv(struct mempool *mp, byte *s, uns cs_in, uns cs_out);
 
 static inline byte *
-mp_conv_to_utf8(struct mempool *mp, byte *s, uns cs_in) 
-{ return mp_conv(mp, s, cs_in, CONV_CHARSET_UTF8); }
+mp_strconv_to_utf8(struct mempool *mp, byte *s, uns cs_in)
+{ return mp_strconv(mp, s, cs_in, CONV_CHARSET_UTF8); }
 
 static inline byte *
-mp_conv_from_utf8(struct mempool *mp, byte *s, uns cs_out)
-{ return mp_conv(mp, s, CONV_CHARSET_UTF8, cs_out); }
+mp_strconv_from_utf8(struct mempool *mp, byte *s, uns cs_out)
+{ return mp_strconv(mp, s, CONV_CHARSET_UTF8, cs_out); }
 
 #endif