From 654da2ffb5abf2afe9532f1d0cb77ed88f8a97cc Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 28 Jan 2014 21:40:13 +0000 Subject: move utf8 conversion routines to use nserror instead of their own error enum --- gtk/dialogs/source.c | 12 ++++++------ gtk/gui.c | 14 ++++++-------- 2 files changed, 12 insertions(+), 14 deletions(-) (limited to 'gtk') diff --git a/gtk/dialogs/source.c b/gtk/dialogs/source.c index a7c98152e..a32bce675 100644 --- a/gtk/dialogs/source.c +++ b/gtk/dialogs/source.c @@ -169,16 +169,16 @@ void nsgtk_source_dialog_init(GtkWindow *parent, struct browser_window *bw) source_data = content_get_source_data(bw->current_content, &source_size); - utf8_convert_ret r = utf8_from_enc( + nserror r = utf8_from_enc( source_data, html_get_encoding(bw->current_content), source_size, &data, &data_len); - if (r == UTF8_CONVERT_NOMEM) { + if (r == NSERROR_NOMEM) { warn_user("NoMemory",0); return; - } else if (r == UTF8_CONVERT_BADENC) { + } else if (r == NSERROR_BAD_ENCODING) { warn_user("EncNotRec",0); return; } @@ -270,7 +270,7 @@ void nsgtk_source_tab_init(GtkWindow *parent, struct browser_window *bw) size_t ndata_len; nsurl *url; nserror error; - utf8_convert_ret r; + nserror r; gchar *filename; char *fileurl; gint handle; @@ -283,10 +283,10 @@ void nsgtk_source_tab_init(GtkWindow *parent, struct browser_window *bw) source_size, &ndata, &ndata_len); - if (r == UTF8_CONVERT_NOMEM) { + if (r == NSERROR_NOMEM) { warn_user("NoMemory",0); return; - } else if (r == UTF8_CONVERT_BADENC) { + } else if (r == NSERROR_BAD_ENCODING) { warn_user("EncNotRec",0); return; } diff --git a/gtk/gui.c b/gtk/gui.c index ad80e8941..c885ad30f 100644 --- a/gtk/gui.c +++ b/gtk/gui.c @@ -788,8 +788,7 @@ gboolean nsgtk_ssl_delete_event(GtkWidget *w, GdkEvent *event, gpointer data) return FALSE; } -utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len, - char **result) +nserror utf8_to_local_encoding(const char *string, size_t len, char **result) { assert(string && result); @@ -798,14 +797,13 @@ utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len, *result = strndup(string, len); if (!(*result)) - return UTF8_CONVERT_NOMEM; + return NSERROR_NOMEM; - return UTF8_CONVERT_OK; + return NSERROR_OK; } -utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, - char **result) +nserror utf8_from_local_encoding(const char *string, size_t len, char **result) { assert(string && result); @@ -814,9 +812,9 @@ utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, *result = strndup(string, len); if (!(*result)) - return UTF8_CONVERT_NOMEM; + return NSERROR_NOMEM; - return UTF8_CONVERT_OK; + return NSERROR_OK; } -- cgit v1.2.3