Substitute not only configuration switches, but also environment variables.

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

diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h
index 2677c8049a1ba32fec9e93b56f717d95a79c05f8..ab6f65d924f71708bf6723afb296c0ebe45558a6 100644 (file)
--- a/charset/mp-charconv.h
+++ b/charset/mp-charconv.h
@@ -1,5 +1,5 @@
 /*
- *     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>
  *
@@ -13,14 +13,14 @@
 #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, const 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, const 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, const byte *s, uns cs_out)
+{ return mp_strconv(mp, s, CONV_CHARSET_UTF8, cs_out); }
 
 #endif