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/menus.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/menus.c')
| -rw-r--r-- | riscos/menus.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/riscos/menus.c b/riscos/menus.c index e51fc34c5..29d514122 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -875,8 +875,7 @@ bool ro_gui_menu_translate(struct menu_definition *menu) int alphabet; struct menu_definition_entry *entry; char *translated; - utf8_convert_ret err; - + nserror err; /* read current alphabet */ error = xosbyte1(osbyte_ALPHABET_NUMBER, 127, 0, &alphabet); @@ -895,8 +894,8 @@ bool ro_gui_menu_translate(struct menu_definition *menu) free(menu->menu->title_data.indirected_text.text); err = utf8_to_local_encoding(messages_get(menu->title_key), 0, &translated); - if (err != UTF8_CONVERT_OK) { - assert(err != UTF8_CONVERT_BADENC); + if (err != NSERROR_OK) { + assert(err != NSERROR_BAD_ENCODING); LOG(("utf8_to_enc failed")); return false; } @@ -912,8 +911,8 @@ bool ro_gui_menu_translate(struct menu_definition *menu) free(entry->menu_entry->data.indirected_text.text); err = utf8_to_local_encoding(messages_get(entry->entry_key), 0, &translated); - if (err != UTF8_CONVERT_OK) { - assert(err != UTF8_CONVERT_BADENC); + if (err != NSERROR_OK) { + assert(err != NSERROR_BAD_ENCODING); LOG(("utf8_to_enc failed")); return false; } |