diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-07-25 15:47:11 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-07-25 15:47:11 +0000 |
| commit | c51b14383cea9ab41bc53ae27051a969f6dafef3 (patch) | |
| tree | e91efe9661d87f7cf490f411406bce05bc8261d2 /css/internal.c | |
| parent | 2c00c55963d62e8732ad83b878c5d32588e89722 (diff) | |
| download | netsurf-c51b14383cea9ab41bc53ae27051a969f6dafef3.tar.gz netsurf-c51b14383cea9ab41bc53ae27051a969f6dafef3.tar.bz2 | |
Now that libwapcaplet guarantees NUL-termination of strings, stop copying them unnecessarily.
svn path=/trunk/netsurf/; revision=8785
Diffstat (limited to 'css/internal.c')
| -rw-r--r-- | css/internal.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/css/internal.c b/css/internal.c index fd22af628..b9aa83f0d 100644 --- a/css/internal.c +++ b/css/internal.c @@ -38,26 +38,15 @@ css_error nscss_resolve_url(void *pw, lwc_context *ctx, const char *base, lwc_string *rel, lwc_string **abs) { lwc_error lerror; - char *rel_url, *abs_url, *norm_url; + char *abs_url, *norm_url; url_func_result res; - /* Copy relative URL and ensure it's NUL terminated */ - rel_url = malloc(lwc_string_length(rel) + 1); - if (rel_url == NULL) - return CSS_NOMEM; - - memcpy(rel_url, lwc_string_data(rel), lwc_string_length(rel)); - rel_url[lwc_string_length(rel)] = '\0'; - /* Resolve URI */ - res = url_join(rel_url, base, &abs_url); + res = url_join(lwc_string_data(rel), base, &abs_url); if (res != URL_FUNC_OK) { - free(rel_url); return res == URL_FUNC_NOMEM ? CSS_NOMEM : CSS_INVALID; } - free(rel_url); - /* Normalise it */ res = url_normalize(abs_url, &norm_url); if (res != URL_FUNC_OK) { |