diff options
author | James Bursa <james@netsurf-browser.org> | 2008-06-03 01:10:46 +0000 |
---|---|---|
committer | James Bursa <james@netsurf-browser.org> | 2008-06-03 01:10:46 +0000 |
commit | 8282253a5415263e2385d47d9416a611a00eea0f (patch) | |
tree | cc7f829f95d164de024821ab8766c136dbd81916 /content/content.c | |
parent | f59d4a3626301e9eb5ae56edf050337e8f6fb4d1 (diff) | |
download | netsurf-8282253a5415263e2385d47d9416a611a00eea0f.tar.gz netsurf-8282253a5415263e2385d47d9416a611a00eea0f.tar.bz2 |
Move struct cache_data from fetch to content as it is no longer needed by fetch. Make it a member instead of pointer in struct content.
svn path=/trunk/netsurf/; revision=4246
Diffstat (limited to 'content/content.c')
-rw-r--r-- | content/content.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/content/content.c b/content/content.c index 6d8ed22e7..e4431453a 100644 --- a/content/content.c +++ b/content/content.c @@ -398,11 +398,6 @@ struct content * content_create(const char *url) talloc_free(c); return 0; } - c->cache_data = talloc(c, struct cache_data); - if (!c->cache_data) { - talloc_free(c); - return 0; - } talloc_set_name_const(c, c->url); c->type = CONTENT_UNKNOWN; c->mime_type = 0; @@ -433,15 +428,15 @@ struct content * content_create(const char *url) c->download = false; c->redirect_count = 0; c->error_count = 0; - c->cache_data->req_time = 0; - c->cache_data->res_time = 0; - c->cache_data->date = 0; - c->cache_data->expires = 0; - c->cache_data->age = INVALID_AGE; - c->cache_data->max_age = INVALID_AGE; - c->cache_data->no_cache = false; - c->cache_data->etag = 0; - c->cache_data->last_modified = 0; + c->cache_data.req_time = 0; + c->cache_data.res_time = 0; + c->cache_data.date = 0; + c->cache_data.expires = 0; + c->cache_data.age = INVALID_AGE; + c->cache_data.max_age = INVALID_AGE; + c->cache_data.no_cache = false; + c->cache_data.etag = 0; + c->cache_data.last_modified = 0; content_set_status(c, messages_get("Loading")); |