From 1fcceb72f680eb9963b519c4b27f89a0977247d5 Mon Sep 17 00:00:00 2001 From: Richard Wilson Date: Thu, 13 Jul 2006 19:48:45 +0000 Subject: Fix url completion svn path=/trunk/netsurf/; revision=2743 --- content/urldb.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'content/urldb.c') diff --git a/content/urldb.c b/content/urldb.c index 5cc56d26c..05c97c6ac 100644 --- a/content/urldb.c +++ b/content/urldb.c @@ -1375,15 +1375,19 @@ bool urldb_iterate_entries_path(const struct path_data *parent, * attached to them. If this is not the case, it indicates * that there's a bug in the file loader/URL insertion code. * Therefore, assert this here. */ - assert(parent->url || parent->cookies); + assert(url_callback || cookie_callback); /** \todo handle fragments? */ - if (url_callback && parent->url && !url_callback(parent->url, - (const struct url_data *) &parent->urld)) - return false; - if (cookie_callback && parent->cookies && !cookie_callback( - (const struct cookie_data *) parent->cookies)) - return false; + if (url_callback) { + assert(parent->url); + if (!url_callback(parent->url, + (const struct url_data *) &parent->urld)) + return false; + } else { + if (parent->cookies && !cookie_callback( + (const struct cookie_data *) parent->cookies)) + return false; + } } for (p = parent->children; p; p = p->next) { -- cgit v1.2.3