Avoid compiler warnings.

diff --git a/ChangeLog b/ChangeLog
index 75d701e..edb56ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-03-25  Bruno Haible  <bruno@clisp.org>
 
+       * lib/uniconv/u8-conv-from-enc.c (u8_conv_from_encoding): Add a cast.
+       * lib/uniconv/u8-strconv-to-enc.c (u8_strconv_to_encoding): Likewise.
+
+2007-03-25  Bruno Haible  <bruno@clisp.org>
+
        * lib/vasnprintf.c: Include langinfo.h.
        (VASNPRINTF): Prefer nl_langinfo over localeconv, since it's more
        multithread-safe.

diff --git a/lib/uniconv/u8-conv-from-enc.c b/lib/uniconv/u8-conv-from-enc.c
index d86ce1d..a193211 100644 (file)
--- a/lib/uniconv/u8-conv-from-enc.c
+++ b/lib/uniconv/u8-conv-from-enc.c
@@ -55,7 +55,7 @@ u8_conv_from_encoding (const char *fromcode,
 
          for (i = 0; i < srclen; )
            {
-             int count = u8_mblen (src + i, srclen - i);
+             int count = u8_mblen ((const uint8_t *) src + i, srclen - i);
              /* We can rely on count > 0 because of the previous u8_check.  */
              if (count <= 0)
                abort ();

diff --git a/lib/uniconv/u8-strconv-to-enc.c b/lib/uniconv/u8-strconv-to-enc.c
index 7dee051..35a9220 100644 (file)
--- a/lib/uniconv/u8-strconv-to-enc.c
+++ b/lib/uniconv/u8-strconv-to-enc.c
@@ -63,7 +63,7 @@ u8_strconv_to_encoding (const uint8_t *string,
     {
       result = NULL;
       length = 0;
-      if (mem_iconveha (string, u8_strlen (string) + 1,
+      if (mem_iconveha ((const char *) string, u8_strlen (string) + 1,
                        "UTF-8", tocode,
                        handler == iconveh_question_mark, handler,
                        NULL, &result, &length) < 0)