From 654da2ffb5abf2afe9532f1d0cb77ed88f8a97cc Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 28 Jan 2014 21:40:13 +0000 Subject: move utf8 conversion routines to use nserror instead of their own error enum --- riscos/help.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'riscos/help.c') diff --git a/riscos/help.c b/riscos/help.c index 14d34af15..9da52f3e6 100644 --- a/riscos/help.c +++ b/riscos/help.c @@ -225,7 +225,7 @@ static void ro_gui_interactive_help_broadcast(wimp_message *message, char *base_token; char *local_token; os_error *error; - utf8_convert_ret err; + nserror err; /* start off with an empty reply */ reply = (help_full_message_reply *)message; @@ -255,9 +255,9 @@ static void ro_gui_interactive_help_broadcast(wimp_message *message, /* convert to local encoding */ err = utf8_to_local_encoding(translated_token, 0, &local_token); - if (err != UTF8_CONVERT_OK) { + if (err != NSERROR_OK) { /* badenc should never happen */ - assert(err != UTF8_CONVERT_BADENC); + assert(err != NSERROR_BAD_ENCODING); /* simply use UTF-8 string */ strncpy(reply->reply, translated_token, 235); } -- cgit v1.2.3