diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/form.c | 14 | ||||
| -rw-r--r-- | render/html.c | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/render/form.c b/render/form.c index 32c38be4b..c9d74a1c2 100644 --- a/render/form.c +++ b/render/form.c @@ -992,7 +992,7 @@ char *form_acceptable_charset(struct form *form) char *form_encode_item(const char *item, uint32_t len, const char *charset, const char *fallback) { - utf8_convert_ret err; + nserror err; char *ret = NULL; char cset[256]; @@ -1002,19 +1002,19 @@ char *form_encode_item(const char *item, uint32_t len, const char *charset, snprintf(cset, sizeof cset, "%s//TRANSLIT", charset); err = utf8_to_enc(item, cset, 0, &ret); - if (err == UTF8_CONVERT_BADENC) { + if (err == NSERROR_BAD_ENCODING) { /* charset not understood, try without transliteration */ snprintf(cset, sizeof cset, "%s", charset); err = utf8_to_enc(item, cset, len, &ret); - if (err == UTF8_CONVERT_BADENC) { + if (err == NSERROR_BAD_ENCODING) { /* nope, try fallback charset (if any) */ if (fallback) { snprintf(cset, sizeof cset, "%s//TRANSLIT", fallback); err = utf8_to_enc(item, cset, 0, &ret); - if (err == UTF8_CONVERT_BADENC) { + if (err == NSERROR_BAD_ENCODING) { /* and without transliteration */ snprintf(cset, sizeof cset, "%s", fallback); @@ -1022,11 +1022,11 @@ char *form_encode_item(const char *item, uint32_t len, const char *charset, } } - if (err == UTF8_CONVERT_BADENC) { + if (err == NSERROR_BAD_ENCODING) { /* that also failed, use 8859-1 */ err = utf8_to_enc(item, "ISO-8859-1//TRANSLIT", 0, &ret); - if (err == UTF8_CONVERT_BADENC) { + if (err == NSERROR_BAD_ENCODING) { /* and without transliteration */ err = utf8_to_enc(item, "ISO-8859-1", 0, &ret); @@ -1034,7 +1034,7 @@ char *form_encode_item(const char *item, uint32_t len, const char *charset, } } } - if (err == UTF8_CONVERT_NOMEM) { + if (err == NSERROR_NOMEM) { return NULL; } diff --git a/render/html.c b/render/html.c index 0a7ab2453..bd23aaca4 100644 --- a/render/html.c +++ b/render/html.c @@ -1765,14 +1765,14 @@ static void html__dom_user_data_handler(dom_node_operation operation, static void html__set_file_gadget_filename(struct content *c, struct form_control *gadget, const char *fn) { - utf8_convert_ret ret; + nserror ret; char *utf8_fn, *oldfile = NULL; html_content *html = (html_content *)c; struct box *file_box = gadget->box; ret = utf8_from_local_encoding(fn,0, &utf8_fn); - if (ret != UTF8_CONVERT_OK) { - assert(ret != UTF8_CONVERT_BADENC); + if (ret != NSERROR_OK) { + assert(ret != NSERROR_BAD_ENCODING); LOG(("utf8_from_local_encoding failed")); /* Load was for us - just no memory */ return; @@ -1874,7 +1874,7 @@ static bool html_drop_file_at_point(struct content *c, int x, int y, char *file) FILE *fp = NULL; char *buffer; char *utf8_buff; - utf8_convert_ret ret; + nserror ret; unsigned int size; int bx, by; @@ -1916,9 +1916,9 @@ static bool html_drop_file_at_point(struct content *c, int x, int y, char *file) /* Convert to UTF-8 */ ret = utf8_from_local_encoding(buffer, file_len, &utf8_buff); - if (ret != UTF8_CONVERT_OK) { + if (ret != NSERROR_OK) { /* bad encoding shouldn't happen */ - assert(ret != UTF8_CONVERT_BADENC); + assert(ret != NSERROR_BAD_ENCODING); LOG(("utf8_from_local_encoding failed")); free(buffer); warn_user("NoMemory", NULL); |