diff options
| -rw-r--r-- | content/fetchers/curl.c | 2 | ||||
| -rw-r--r-- | content/llcache.c | 4 | ||||
| -rw-r--r-- | desktop/browser.c | 5 | ||||
| -rw-r--r-- | utils/nsurl.c | 2 | ||||
| -rw-r--r-- | utils/nsurl.h | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index be2b6c806..dab7d2b93 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -322,7 +322,7 @@ void fetch_curl_finalise(lwc_string *scheme) bool fetch_curl_can_fetch(const nsurl *url) { - return nsurl_enquire(url, NSURL_HOST); + return nsurl_has_component(url, NSURL_HOST); } /** diff --git a/content/llcache.c b/content/llcache.c index efbdfbcd2..71de3a070 100644 --- a/content/llcache.c +++ b/content/llcache.c @@ -724,10 +724,10 @@ nserror llcache_object_retrieve(nsurl *url, uint32_t flags, */ /* Look for a query segment */ - has_query = nsurl_enquire(url, NSURL_QUERY); + has_query = nsurl_has_component(url, NSURL_QUERY); /* Get rid of any url fragment */ - if (nsurl_enquire(url, NSURL_FRAGMENT)) { + if (nsurl_has_component(url, NSURL_FRAGMENT)) { error = nsurl_defragment(url, &defragmented_url); if (error != NSERROR_OK) return error; diff --git a/desktop/browser.c b/desktop/browser.c index a4e80d449..760849f6a 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -794,7 +794,7 @@ void browser_window_go_post(struct browser_window *bw, const char *url, lwc_string_unref(bw->frag_id); bw->frag_id = NULL; - if (nsurl_enquire(nsurl, NSURL_FRAGMENT)) { + if (nsurl_has_component(nsurl, NSURL_FRAGMENT)) { bool same_url = false; bw->frag_id = nsurl_get_component(nsurl, NSURL_FRAGMENT); @@ -811,7 +811,8 @@ void browser_window_go_post(struct browser_window *bw, const char *url, * don't bother to fetch, just update the window. */ if (same_url && fetch_is_post == false && - nsurl_enquire(nsurl, NSURL_QUERY) == false) { + nsurl_has_component(nsurl, NSURL_QUERY) == + false) { nsurl_unref(nsurl); if (nsref != NULL) nsurl_unref(nsref); diff --git a/utils/nsurl.c b/utils/nsurl.c index 96c775e51..079a56c7b 100644 --- a/utils/nsurl.c +++ b/utils/nsurl.c @@ -1482,7 +1482,7 @@ lwc_string *nsurl_get_component(const nsurl *url, nsurl_component part) /* exported interface, documented in nsurl.h */ -bool nsurl_enquire(const nsurl *url, nsurl_component part) +bool nsurl_has_component(const nsurl *url, nsurl_component part) { assert(url != NULL); diff --git a/utils/nsurl.h b/utils/nsurl.h index 46496f212..62b8477a7 100644 --- a/utils/nsurl.h +++ b/utils/nsurl.h @@ -165,7 +165,7 @@ lwc_string *nsurl_get_component(const nsurl *url, nsurl_component part); * NSURL_QUERY * NSURL_FRAGMENT */ -bool nsurl_enquire(const nsurl *url, nsurl_component part); +bool nsurl_has_component(const nsurl *url, nsurl_component part); /** |