diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2014-01-28 21:40:13 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2014-01-28 21:40:13 +0000 |
| commit | 654da2ffb5abf2afe9532f1d0cb77ed88f8a97cc (patch) | |
| tree | efbc3d97a8650b682b7181e748698de9c555d80d /riscos/wimp.c | |
| parent | 4b760c7e499e2f5cb1d06242d5f186e14e94496a (diff) | |
| download | netsurf-654da2ffb5abf2afe9532f1d0cb77ed88f8a97cc.tar.gz netsurf-654da2ffb5abf2afe9532f1d0cb77ed88f8a97cc.tar.bz2 | |
move utf8 conversion routines to use nserror instead of their own error enum
Diffstat (limited to 'riscos/wimp.c')
| -rw-r--r-- | riscos/wimp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/riscos/wimp.c b/riscos/wimp.c index 87860ad35..2e488918d 100644 --- a/riscos/wimp.c +++ b/riscos/wimp.c @@ -273,12 +273,12 @@ void ro_gui_set_icon_string(wimp_w w, wimp_i i, const char *text, bool is_utf8) unsigned int button_type; if (is_utf8) { - utf8_convert_ret err; + nserror err; /* convert text to local encoding */ err = utf8_to_local_encoding(text, 0, &local_text); - if (err != UTF8_CONVERT_OK) { + if (err != NSERROR_OK) { /* A bad encoding should never happen, so assert this */ - assert(err != UTF8_CONVERT_BADENC); + assert(err != NSERROR_BAD_ENCODING); LOG(("utf8_to_enc failed")); /* Paranoia */ local_text = NULL; @@ -677,7 +677,7 @@ void ro_gui_set_window_title(wimp_w w, const char *text) wimp_window_info_base window; os_error *error; char *title_local_enc; - utf8_convert_ret err; + nserror err; /* Get the window details */ @@ -692,10 +692,10 @@ void ro_gui_set_window_title(wimp_w w, const char *text) /* convert text to local encoding */ err = utf8_to_local_encoding(text, 0, &title_local_enc); - if (err != UTF8_CONVERT_OK) { + if (err != NSERROR_OK) { /* A bad encoding should never happen, * so assert this */ - assert(err != UTF8_CONVERT_BADENC); + assert(err != NSERROR_BAD_ENCODING); LOG(("utf8_to_enc failed")); return; } |