From 20b3c408167b2093f1d2d68792550ff6ec44aabd Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 5 Mar 2014 15:10:02 +0000 Subject: make nsurl_defragment() API more obvious and remove duplicated parameter checking --- content/urldb.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'content/urldb.c') diff --git a/content/urldb.c b/content/urldb.c index f55a1c291..1e17ac575 100644 --- a/content/urldb.c +++ b/content/urldb.c @@ -1806,14 +1806,9 @@ struct path_data *urldb_add_path(lwc_string *scheme, unsigned int port, free(path_query); if (d && !d->url) { - /* Insert URL */ - if (nsurl_has_component(url, NSURL_FRAGMENT)) { - nserror err = nsurl_defragment(url, &d->url); - if (err != NSERROR_OK) - return NULL; - } else { - d->url = nsurl_ref(url); - } + /* Insert defragmented URL */ + if (nsurl_defragment(url, &d->url) != NSERROR_OK) + return NULL; } return d; @@ -2728,12 +2723,8 @@ bool urldb_set_cookie(const char *header, nsurl *url, nsurl *referer) assert(url && header); /* Get defragmented URL, as 'urlt' */ - if (nsurl_has_component(url, NSURL_FRAGMENT)) { - if (nsurl_defragment(url, &urlt) != NSERROR_OK) - return NULL; - } else { - urlt = nsurl_ref(url); - } + if (nsurl_defragment(url, &urlt) != NSERROR_OK) + return NULL; scheme = nsurl_get_component(url, NSURL_SCHEME); if (scheme == NULL) { -- cgit v1.2.3