From 14e282948996f75e87a14ab90f4b3ed54d9d6ad7 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sun, 26 Oct 2014 12:42:53 +0000
Subject: remove the die API from the core.

The die() API for abnormal termination does not belong within the core
of netsurf and instead errors are propogated back to the callers.

This is the final part of this change and the API is now only used within
some parts of the frontends
---
 content/urldb.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'content/urldb.c')

diff --git a/content/urldb.c b/content/urldb.c
index c74dae36d..650c7bc51 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -343,7 +343,7 @@ static struct bloom_filter *url_bloom;
  *
  * \param filename Name of file containing data
  */
-void urldb_load(const char *filename)
+nserror urldb_load(const char *filename)
 {
 #define MAXIMUM_URL_LENGTH 4096
 	char s[MAXIMUM_URL_LENGTH];
@@ -365,24 +365,24 @@ void urldb_load(const char *filename)
 	fp = fopen(filename, "r");
 	if (!fp) {
 		LOG(("Failed to open file '%s' for reading", filename));
-		return;
+		return NSERROR_NOT_FOUND;
 	}
 
 	if (!fgets(s, MAXIMUM_URL_LENGTH, fp)) {
 		fclose(fp);
-		return;
+		return NSERROR_NEED_DATA;
 	}
 
 	version = atoi(s);
 	if (version < MIN_URL_FILE_VERSION) {
 		LOG(("Unsupported URL file version."));
 		fclose(fp);
-		return;
+		return NSERROR_INVALID;
 	}
 	if (version > URL_FILE_VERSION) {
 		LOG(("Unknown URL file version."));
 		fclose(fp);
-		return;
+		return NSERROR_INVALID;
 	}
 
 	while (fgets(host, sizeof host, fp)) {
@@ -417,7 +417,8 @@ void urldb_load(const char *filename)
 		h = urldb_add_host(host);
 		if (!h) {
 			LOG(("Failed adding host: '%s'", host));
-			die("Memory exhausted whilst loading URL file");
+			fclose(fp);
+			return NSERROR_NOMEM;
 		}
 
 		/* load the non-corrupt data */
@@ -467,8 +468,8 @@ void urldb_load(const char *filename)
 			 */
 			if (nsurl_create(url, &nsurl) != NSERROR_OK) {
 				LOG(("Failed inserting '%s'", url));
-				die("Memory exhausted whilst loading "
-						"URL file");
+				fclose(fp);
+				return NSERROR_NOMEM;
 			}
                         
 			if (url_bloom != NULL) {
@@ -480,8 +481,8 @@ void urldb_load(const char *filename)
 			if (nsurl_get(nsurl, NSURL_PATH | NSURL_QUERY,
 					&path_query, &len) != NSERROR_OK) {
 				LOG(("Failed inserting '%s'", url));
-				die("Memory exhausted whilst loading "
-						"URL file");
+				fclose(fp);
+				return NSERROR_NOMEM;
 			}
 
 			scheme_lwc = nsurl_get_component(nsurl, NSURL_SCHEME);
@@ -491,8 +492,8 @@ void urldb_load(const char *filename)
 					fragment_lwc, nsurl);
 			if (!p) {
 				LOG(("Failed inserting '%s'", url));
-				die("Memory exhausted whilst loading "
-						"URL file");
+				fclose(fp);
+				return NSERROR_NOMEM;
 			}
 			nsurl_unref(nsurl);
 			lwc_string_unref(scheme_lwc);
@@ -533,6 +534,8 @@ void urldb_load(const char *filename)
 	fclose(fp);
 	LOG(("Successfully loaded URL file"));
 #undef MAXIMUM_URL_LENGTH
+
+	return NSERROR_OK;
 }
 
 /**
-- 
cgit v1.2.3