From 2e869ade2a1ed2d13f3d831d3d1f933006cacbdd Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 11 Oct 2012 14:38:10 +0100 Subject: Cleanup. --- content/fetch.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'content/fetch.c') diff --git a/content/fetch.c b/content/fetch.c index 51eed0e2f..028fe9ee4 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -248,8 +248,7 @@ struct fetch * fetch_start(nsurl *url, nsurl *referer, /* The URL we're fetching must have a scheme */ scheme = nsurl_get_component(url, NSURL_SCHEME); - if (scheme == NULL) - goto failed; + assert(scheme != NULL); #ifdef DEBUG_FETCH_VERBOSE LOG(("fetch %p, url '%s'", fetch, nsurl_access(url))); @@ -307,12 +306,10 @@ struct fetch * fetch_start(nsurl *url, nsurl *referer, lwc_string_unref(ref_scheme); } - if (fetch->url == NULL) - goto failed; - /* Pick the scheme ops */ while (fetcher) { - if ((lwc_string_isequal(fetcher->scheme_name, scheme, &match) == lwc_error_ok) && (match == true)) { + if ((lwc_string_isequal(fetcher->scheme_name, scheme, + &match) == lwc_error_ok) && (match == true)) { fetch->ops = fetcher; break; } @@ -343,8 +340,7 @@ struct fetch * fetch_start(nsurl *url, nsurl *referer, return fetch; failed: - if (scheme != NULL) - lwc_string_unref(scheme); + lwc_string_unref(scheme); if (fetch->host != NULL) lwc_string_unref(fetch->host); -- cgit v1.2.3