Tests for module 'unicase/u16-is-uppercase'.

[gnulib.git] / lib / unicodeio.c

diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index bfe7483..781621c 100644 (file)
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -106,7 +106,7 @@ unicode_to_mb (unsigned int code,
     }
 
   /* Convert the character to UTF-8.  */
-  count = utf8_uctomb ((unsigned char *) inbuf, code, sizeof (inbuf));
+  count = u8_uctomb ((unsigned char *) inbuf, code, sizeof (inbuf));
   if (count < 0)
     return failure (code, N_("character out of range"), callback_arg);
 
@@ -168,7 +168,8 @@ fwrite_success_callback (const char *buf, size_t buflen, void *callback_arg)
 
 /* Simple failure callback that displays an error and exits.  */
 static long
-exit_failure_callback (unsigned int code, const char *msg, void *callback_arg)
+exit_failure_callback (unsigned int code, const char *msg,
+                      void *callback_arg _UNUSED_PARAMETER_)
 {
   if (msg == NULL)
     error (1, 0, _("cannot convert U+%04X to local character set"), code);
@@ -181,7 +182,9 @@ exit_failure_callback (unsigned int code, const char *msg, void *callback_arg)
 /* Simple failure callback that displays a fallback representation in plain
    ASCII, using the same notation as ISO C99 strings.  */
 static long
-fallback_failure_callback (unsigned int code, const char *msg, void *callback_arg)
+fallback_failure_callback (unsigned int code,
+                          const char *msg _UNUSED_PARAMETER_,
+                          void *callback_arg)
 {
   FILE *stream = (FILE *) callback_arg;