move utf8 conversion routines to use nserror instead of their own error enum

4 files changed, 18 insertions, 21 deletions

diff --git a/desktop/global_history.c b/desktop/global_history.c
index e8d99efc2..9d0e47e34 100644
--- a/desktop/global_history.c
+++ b/desktop/global_history.c
@@ -828,21 +828,21 @@ static nserror global_history_export_enter_cb(void *ctx, void *node_data,
 		enum treeview_node_type type, bool *abort)
 {
 	struct treeview_export_walk_ctx *tw = ctx;
+	nserror ret;
 
 	if (type == TREE_NODE_ENTRY) {
 		struct global_history_entry *e = node_data;
-		utf8_convert_ret ret;
 		char *t_text;
 		char *u_text;
 
 		ret = utf8_to_html(e->data[GH_TITLE].value, "iso-8859-1",
 				e->data[GH_TITLE].value_len, &t_text);
-		if (ret != UTF8_CONVERT_OK)
+		if (ret != NSERROR_OK)
 			return NSERROR_SAVE_FAILED;
 
 		ret = utf8_to_html(e->data[GH_URL].value, "iso-8859-1",
 				e->data[GH_URL].value_len, &u_text);
-		if (ret != UTF8_CONVERT_OK) {
+		if (ret != NSERROR_OK) {
 			free(t_text);
 			return NSERROR_SAVE_FAILED;
 		}
@@ -855,12 +855,11 @@ static nserror global_history_export_enter_cb(void *ctx, void *node_data,
 
 	} else if (type == TREE_NODE_FOLDER) {
 		struct global_history_folder *f = node_data;
-		utf8_convert_ret ret;
 		char *f_text;
 
 		ret = utf8_to_html(f->data.value, "iso-8859-1",
 				f->data.value_len, &f_text);
-		if (ret != UTF8_CONVERT_OK)
+		if (ret != NSERROR_OK)
 			return NSERROR_SAVE_FAILED;
 
 		fprintf(tw->fp, "<li><h4>%s</h4>\n<ul>\n", f_text);
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index 01fabc257..219a348ef 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -879,21 +879,21 @@ static nserror hotlist_export_enter_cb(void *ctx, void *node_data,
 		enum treeview_node_type type, bool *abort)
 {
 	struct treeview_export_walk_ctx *tw = ctx;
+	nserror ret;
 
 	if (type == TREE_NODE_ENTRY) {
 		struct hotlist_entry *e = node_data;
-		utf8_convert_ret ret;
 		char *t_text;
 		char *u_text;
 
 		ret = utf8_to_html(e->data[HL_TITLE].value, "iso-8859-1",
 				e->data[HL_TITLE].value_len, &t_text);
-		if (ret != UTF8_CONVERT_OK)
+		if (ret != NSERROR_OK)
 			return NSERROR_SAVE_FAILED;
 
 		ret = utf8_to_html(e->data[HL_URL].value, "iso-8859-1",
 				e->data[HL_URL].value_len, &u_text);
-		if (ret != UTF8_CONVERT_OK) {
+		if (ret != NSERROR_OK) {
 			free(t_text);
 			return NSERROR_SAVE_FAILED;
 		}
@@ -906,12 +906,11 @@ static nserror hotlist_export_enter_cb(void *ctx, void *node_data,
 
 	} else if (type == TREE_NODE_FOLDER) {
 		struct hotlist_folder *f = node_data;
-		utf8_convert_ret ret;
 		char *f_text;
 
 		ret = utf8_to_html(f->data.value, "iso-8859-1",
 				f->data.value_len, &f_text);
-		if (ret != UTF8_CONVERT_OK)
+		if (ret != NSERROR_OK)
 			return NSERROR_SAVE_FAILED;
 
 		if (f == hl_ctx.default_folder) {
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index da87a65fe..99b1ac4b7 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -547,7 +547,6 @@ static bool save_complete_rewrite_url_value(save_complete_ctx *ctx,
 	hlcache_handle *content;
 	char *escaped;
 	nserror error;
-	utf8_convert_ret ret;
 
 	error = nsurl_join(ctx->base, value, &url);
 	if (error == NSERROR_NOMEM)
@@ -562,11 +561,11 @@ static bool save_complete_rewrite_url_value(save_complete_ctx *ctx,
 			fprintf(ctx->fp, "\"%p\"", content);
 		} else {
 			/* no match found */
-			ret = utf8_to_html(nsurl_access(url), "UTF-8",
+			error = utf8_to_html(nsurl_access(url), "UTF-8",
 					nsurl_length(url), &escaped);
 			nsurl_unref(url);
 
-			if (ret != UTF8_CONVERT_OK)
+			if (error != NSERROR_OK)
 				return false;
 
 			fprintf(ctx->fp, "\"%s\"", escaped);
@@ -574,8 +573,8 @@ static bool save_complete_rewrite_url_value(save_complete_ctx *ctx,
 			free(escaped);
 		}
 	} else {
-		ret = utf8_to_html(value, "UTF-8", value_len, &escaped);
-		if (ret != UTF8_CONVERT_OK)
+		error = utf8_to_html(value, "UTF-8", value_len, &escaped);
+		if (error != NSERROR_OK)
 			return false;
 
 		fprintf(ctx->fp, "\"%s\"", escaped);
@@ -590,10 +589,10 @@ static bool save_complete_write_value(save_complete_ctx *ctx,
 		const char *value, size_t value_len)
 {
 	char *escaped;
-	utf8_convert_ret ret;
+	nserror ret;
 
 	ret = utf8_to_html(value, "UTF-8", value_len, &escaped);
-	if (ret != UTF8_CONVERT_OK)
+	if (ret != NSERROR_OK)
 		return false;
 
 	fprintf(ctx->fp, "\"%s\"", escaped);
@@ -919,7 +918,7 @@ static bool save_complete_node_handler(dom_node *node,
 	save_complete_ctx *ctx = ctxin;
 	dom_node_type type;
 	dom_exception error;
-	utf8_convert_ret ret;
+	nserror ret;
 
 	error = dom_node_get_node_type(node, &type);
 	if (error != DOM_NO_ERR)
@@ -953,7 +952,7 @@ static bool save_complete_node_handler(dom_node *node,
 
 				ret = utf8_to_html(text_data, "UTF-8",
 						text_len, &escaped);
-				if (ret != UTF8_CONVERT_OK)
+				if (ret != NSERROR_OK)
 					return false;
 
 				fwrite(escaped, sizeof(*escaped), 
diff --git a/desktop/save_text.c b/desktop/save_text.c
index 92cf32a9f..38f8c5334 100644
--- a/desktop/save_text.c
+++ b/desktop/save_text.c
@@ -58,7 +58,7 @@ void save_as_text(hlcache_handle *c, char *path)
 	struct save_text_state save = { NULL, 0, 0 };
 	save_text_whitespace before = WHITESPACE_NONE;
 	bool first = true;
-	utf8_convert_ret ret;
+	nserror ret;
 	char *result;
 
 	if (!c || content_get_type(c) != CONTENT_HTML) {
@@ -72,7 +72,7 @@ void save_as_text(hlcache_handle *c, char *path)
 	ret = utf8_to_local_encoding(save.block, save.length, &result);
 	free(save.block);
 
-	if (ret != UTF8_CONVERT_OK) {
+	if (ret != NSERROR_OK) {
 		LOG(("failed to convert to local encoding, return %d", ret));
 		return;
 	}