From 115985f069247d5eb6c5955de7de110114db9ca4 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Tue, 9 Aug 2016 12:26:37 +0100
Subject: extend url database unit testing to cover more API

---
 content/urldb.c | 34 ++++++++++++++++++++++++----------
 content/urldb.h |  3 ++-
 2 files changed, 26 insertions(+), 11 deletions(-)

(limited to 'content')

diff --git a/content/urldb.c b/content/urldb.c
index 35254921a..12a3d4182 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -2801,8 +2801,16 @@ bool urldb_add_url(nsurl *url)
 	h = urldb_add_host(host_str);
 
 	/* Get path entry */
-	p = (h != NULL) ? urldb_add_path(scheme, port_int, h, path_query,
-			fragment, url) : NULL;
+	if (h != NULL) {
+		p = urldb_add_path(scheme,
+				   port_int,
+				   h,
+				   path_query,
+				   fragment,
+				   url);
+	} else {
+		p = NULL;
+	}
 
 	lwc_string_unref(scheme);
 	if (fragment != NULL)
@@ -3074,23 +3082,29 @@ bool urldb_get_cert_permissions(nsurl *url)
 
 
 /* exported interface documented in content/urldb.h */
-void urldb_set_thumbnail(nsurl *url, struct bitmap *bitmap)
+bool urldb_set_thumbnail(nsurl *url, struct bitmap *bitmap)
 {
 	struct path_data *p;
 
 	assert(url);
 
-	p = urldb_find_url(url);
-	if (p != NULL) {
+	/* add url, in case it's missing */
+	urldb_add_url(url);
 
-		LOG("Setting bitmap on %s", nsurl_access(url));
+	p = urldb_find_url(url);
+	if (p == NULL) {
+		return false;
+	}
 
-		if (p->thumb && p->thumb != bitmap) {
-			guit->bitmap->destroy(p->thumb);
-		}
+	LOG("Setting bitmap on %s", nsurl_access(url));
 
-		p->thumb = bitmap;
+	if ((p->thumb) && (p->thumb != bitmap)) {
+		guit->bitmap->destroy(p->thumb);
 	}
+
+	p->thumb = bitmap;
+
+	return true;
 }
 
 
diff --git a/content/urldb.h b/content/urldb.h
index 124640150..9ff3a8d37 100644
--- a/content/urldb.h
+++ b/content/urldb.h
@@ -111,8 +111,9 @@ bool urldb_get_cert_permissions(struct nsurl *url);
  *
  * \param url Absolute URL to consider
  * \param bitmap Opaque pointer to thumbnail data, or NULL to invalidate
+ * \return true on sucessful setting else false
  */
-void urldb_set_thumbnail(struct nsurl *url, struct bitmap *bitmap);
+bool urldb_set_thumbnail(struct nsurl *url, struct bitmap *bitmap);
 
 
 /**
-- 
cgit v1.2.3