Better messages and sort-test controls.

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

diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h
index f3d7bd232016375eaf93c1059fde0a4a1b788e26..f33cd373e590620a7ceb9e6051d3b166fc89952c 100644 (file)
--- a/charset/mp-charconv.h
+++ b/charset/mp-charconv.h
@@ -1,7 +1,10 @@
 /*
 /*

- *     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>
  *
  *     (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_MP_CHARCONV_H
  */
 
 #ifndef _CHARSET_MP_CHARCONV_H


@@ -10,14 +13,14 @@
 #include "lib/mempool.h"
 #include "charset/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 *
 
 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 *
 
 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
 
 #endif