From 006a24e81090a8a1bfe8c116ca599d5ec95a060e Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 27 Dec 2003 00:37:10 +0000 Subject: [project @ 2003-12-27 00:37:10 by jmb] More code tidying... svn path=/import/netsurf/; revision=453 --- utils/utils.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/utils/utils.c b/utils/utils.c index e8a8fbabc..2ebdf9e5d 100644 --- a/utils/utils.c +++ b/utils/utils.c @@ -182,7 +182,8 @@ char *url_join(char *rel_url, char *base_url) LOG(("rel_url = %s, base_url = %s", rel_url, base_url)); if (!base_url) { - res = uri_cannonicalize_string(rel_url, strlen(rel_url), + res = uri_cannonicalize_string(rel_url, + (int)(strlen(rel_url)), URI_STRING_URI_STYLE); LOG(("res = %s", res)); if (res) @@ -190,20 +191,20 @@ char *url_join(char *rel_url, char *base_url) return 0; } - base = uri_alloc(base_url, strlen(base_url)); - rel = uri_alloc(rel_url, strlen(rel_url)); + base = uri_alloc(base_url, (int)(strlen(base_url))); + rel = uri_alloc(rel_url, (int)(strlen(rel_url))); if (!base || !rel) goto fail; if (!base->scheme) goto fail; abs = uri_abs_1(base, rel); - + res = xstrdup(uri_uri(abs)); uri_free(base); uri_free(rel); - + LOG(("res = %s", res)); return res; @@ -231,7 +232,7 @@ char *get_host_from_url(char *url) char *host = 0; uri_t *uri; - uri = uri_alloc(url, strlen(url)); + uri = uri_alloc(url, (int)(strlen(url))); if (!uri) return 0; if (uri->host) -- cgit v1.2.3