summaryrefslogtreecommitdiff
path: root/content
diff options
context:
space:
mode:
authorRichard Wilson <rjw@netsurf-browser.org>2006-03-04 20:46:35 +0000
committerRichard Wilson <rjw@netsurf-browser.org>2006-03-04 20:46:35 +0000
commit25a995931da1be77df132f7355218e86b0d0c00d (patch)
tree8cf65d6088245971d68e567aba59c4bae66afa64 /content
parentb48ed604f558dcb43a35c317c78402b429ae0542 (diff)
downloadnetsurf-25a995931da1be77df132f7355218e86b0d0c00d.tar.gz
netsurf-25a995931da1be77df132f7355218e86b0d0c00d.tar.bz2
[project @ 2006-03-04 20:46:35 by rjw]
Continue work towards favicon support. svn path=/import/netsurf/; revision=2104
Diffstat (limited to 'content')
-rw-r--r--content/url_store.c8
-rw-r--r--content/url_store.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/content/url_store.c b/content/url_store.c
index 02ecaf6c9..fde956e46 100644
--- a/content/url_store.c
+++ b/content/url_store.c
@@ -356,7 +356,7 @@ struct hostname_data *url_store_match_hostname(
* \param reference internal reference (NULL for first call)
* \return the next URL that matches
*/
-char *url_store_match(const char *url, struct url_data **reference) {
+struct url_content *url_store_match(const char *url, struct url_data **reference) {
struct hostname_data *hostname;
struct url_data *search = NULL;
url_func_result res;
@@ -404,7 +404,7 @@ char *url_store_match(const char *url, struct url_data **reference) {
hostname = url_store_match_hostname(NULL);
if (!hostname)
return NULL;
- } else {
+ } else {
search = *reference;
hostname = search->parent;
}
@@ -429,7 +429,7 @@ char *url_store_match(const char *url, struct url_data **reference) {
(!strncmp(search->data.url, url,
current_match_url_length))) {
*reference = search;
- return search->data.url;
+ return &search->data;
}
/* try with 'www.' inserted after the scheme */
if (current_match_www_test &&
@@ -448,7 +448,7 @@ char *url_store_match(const char *url, struct url_data **reference) {
current_match_url_length -
current_match_scheme_length - 3))) {
*reference = search;
- return search->data.url;
+ return &search->data;
}
}
}
diff --git a/content/url_store.h b/content/url_store.h
index afd121680..c10bc90d0 100644
--- a/content/url_store.h
+++ b/content/url_store.h
@@ -47,7 +47,7 @@ struct url_data {
extern struct hostname_data *url_store_hostnames;
struct url_content *url_store_find(const char *url);
-char *url_store_match(const char *url, struct url_data **reference);
+struct url_content *url_store_match(const char *url, struct url_data **reference);
char *url_store_match_string(const char *text);
void url_store_add_thumbnail(const char *url, struct bitmap *bitmap);