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/query.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/query.c')
| -rw-r--r-- | riscos/query.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/riscos/query.c b/riscos/query.c index 6401ad2b8..226849462 100644 --- a/riscos/query.c +++ b/riscos/query.c @@ -150,7 +150,7 @@ query_id query_user_xy(const char *query, const char *detail, int len; int tx; char *local_text = NULL; - utf8_convert_ret err; + nserror err; qw = malloc(sizeof(struct gui_query_window)); if (!qw) { @@ -171,8 +171,8 @@ query_id query_user_xy(const char *query, const char *detail, /* set the text of the 'Yes' button and size accordingly */ err = utf8_to_local_encoding(yes, 0, &local_text); - if (err != UTF8_CONVERT_OK) { - assert(err != UTF8_CONVERT_BADENC); + if (err != NSERROR_OK) { + assert(err != NSERROR_BAD_ENCODING); LOG(("utf8_to_local_encoding_failed")); local_text = NULL; } @@ -201,8 +201,8 @@ query_id query_user_xy(const char *query, const char *detail, /* set the text of the 'No' button and size accordingly */ err = utf8_to_local_encoding(no, 0, &local_text); - if (err != UTF8_CONVERT_OK) { - assert(err != UTF8_CONVERT_BADENC); + if (err != NSERROR_OK) { + assert(err != NSERROR_BAD_ENCODING); LOG(("utf8_to_local_encoding_failed")); local_text = NULL; } |