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/save.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/save.c')
| -rw-r--r-- | riscos/save.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/riscos/save.c b/riscos/save.c index 59222c49a..cc123444c 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -614,7 +614,7 @@ static void ro_gui_save_drag_end(wimp_dragged *drag, void *data) os_error *error; char *dp, *ep; char *local_name = NULL; - utf8_convert_ret err; + nserror err; if (dragbox_active) ro_gui_drag_box_cancel(); @@ -651,9 +651,9 @@ static void ro_gui_save_drag_end(wimp_dragged *drag, void *data) /* saving directly from browser window, choose a * name based upon the URL */ err = utf8_to_local_encoding(save_leafname, 0, &local_name); - if (err != UTF8_CONVERT_OK) { + if (err != NSERROR_OK) { /* badenc should never happen */ - assert(err != UTF8_CONVERT_BADENC); + assert(err != NSERROR_BAD_ENCODING); local_name = NULL; } name = local_name ? local_name : save_leafname; @@ -1216,7 +1216,7 @@ void ro_gui_save_set_state(hlcache_handle *h, gui_save_type save_type, const char *name = gui_save_table[save_type].name; bool done = false; char *nice = NULL; - utf8_convert_ret err; + nserror err; char *local_name; size_t i; @@ -1270,9 +1270,9 @@ void ro_gui_save_set_state(hlcache_handle *h, gui_save_type save_type, leaf_buf[leaf_len - 1] = 0; err = utf8_to_local_encoding(name, 0, &local_name); - if (err != UTF8_CONVERT_OK) { + if (err != NSERROR_OK) { /* badenc should never happen */ - assert(err != UTF8_CONVERT_BADENC); + assert(err != NSERROR_BAD_ENCODING); local_name = NULL; } |