Opt: Constify

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

diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h
index 6519535a38504bdf86d5ad10adb542119cc39b91..5401d4f308955cd8326f057184e4a9571f910b71 100644 (file)
--- a/charset/mp-charconv.h
+++ b/charset/mp-charconv.h
@@ -1,24 +1,28 @@
 /*
 /*

- *     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 _MP_CHARCONV_H
-#define _MP_CHARCONV_H
+#ifndef _CHARSET_MP_CHARCONV_H
+#define _CHARSET_MP_CHARCONV_H
+
+#include <ucw/mempool.h>
+#include <charset/charconv.h>

 
 

-#include "lib/mempool.h"
-#include "charset/charconv.h"
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define mp_strconv ucw_mp_strconv
+#endif

 
 

-byte *
-mp_conv(struct mempool *mp, byte *s, uns cs_in, uns cs_out);
+byte *mp_strconv(struct mempool *mp, const byte *s, uint cs_in, uint 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); }
+static inline byte *mp_strconv_to_utf8(struct mempool *mp, const byte *s, uint 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); }
+static inline byte *mp_strconv_from_utf8(struct mempool *mp, const byte *s, uint cs_out)
+{ return mp_strconv(mp, s, CONV_CHARSET_UTF8, cs_out); }

 
 #endif
 
 #endif