netsurf: branch vince/disccache updated. release/3.0-1127-g0e952d5

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/0e952d5e6ebaefc9e9889... ...commit http://git.netsurf-browser.org/netsurf.git/commit/0e952d5e6ebaefc9e9889d7... ...tree http://git.netsurf-browser.org/netsurf.git/tree/0e952d5e6ebaefc9e9889d753... The branch, vince/disccache has been updated via 0e952d5e6ebaefc9e9889d753895683396aeaa5f (commit) from 5b625b4479a813c4284e40d5011769204f66a19e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=0e952d5e6ebaefc9e98... commit 0e952d5e6ebaefc9e9889d753895683396aeaa5f Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; restructure slightly to be more obvious diff --git a/content/llcache.c b/content/llcache.c index 6731a28..62faae6 100644 --- a/content/llcache.c +++ b/content/llcache.c @@ -1071,6 +1071,23 @@ llcache_persist_retrieve(llcache_object *object) static nserror llcache_process_metadata(llcache_object *object, uint8_t *data, size_t datasize) { + uint8_t *metadata = NULL; + size_t metadatalen = 0; + + /* attempt to retrieve object metadata from the cache */ + error = guit->llcache->meta(object->url, &metadata, &metadatalen); + if (error != NSERROR_OK) + return error; + + + + free(metadata); + + object->source_alloc = object->source_len; + + /* metadata says object stored in backing store */ + object->store_state = LLCACHE_STORE_DISC; + return NSERROR_NOT_FOUND; } @@ -1079,19 +1096,20 @@ llcache_process_metadata(llcache_object *object, uint8_t *data, size_t datasize) */ static nserror llcache_object_fetch_persistant(llcache_object *object, - uint32_t flags, - nsurl *referer, - const llcache_post_data *post, - uint32_t redirect_count) + uint32_t flags, + nsurl *referer, + const llcache_post_data *post, + uint32_t redirect_count) { nserror error; nsurl *referer_clone = NULL; llcache_post_data *post_clone = NULL; - uint8_t *metadata = NULL; - size_t metadatalen = 0; - /* attempt to retrieve object metadata from the cache */ - error = guit->llcache->meta(object->url, &metadata, &metadatalen); + object->cache.req_time = time(NULL); + object->cache.fin_time = object->cache.req_time; + + /* retrieve and process metadata */ + error = llcache_process_metadata(object); if (error != NSERROR_OK) return error; @@ -1105,27 +1123,15 @@ llcache_object_fetch_persistant(llcache_object *object, if (referer != NULL) referer_clone = nsurl_ref(referer); - object->cache.req_time = time(NULL); - object->cache.fin_time = object->cache.req_time; - object->fetch.flags = flags; object->fetch.referer = referer_clone; object->fetch.post = post_clone; object->fetch.redirect_count = redirect_count; - /* process the metadata */ - error = llcache_process_metadata(object, metadata, metadatalen); - free(metadata); - if (error != NSERROR_OK) - return error; - /* fetch is "finished" */ object->fetch.state = LLCACHE_FETCH_COMPLETE; object->fetch.fetch = NULL; - object->store_state = LLCACHE_STORE_DISC; - object->source_alloc = object->source_len; - return NSERROR_OK; } ----------------------------------------------------------------------- Summary of changes: content/llcache.c | 46 ++++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/content/llcache.c b/content/llcache.c index 6731a28..62faae6 100644 --- a/content/llcache.c +++ b/content/llcache.c @@ -1071,6 +1071,23 @@ llcache_persist_retrieve(llcache_object *object) static nserror llcache_process_metadata(llcache_object *object, uint8_t *data, size_t datasize) { + uint8_t *metadata = NULL; + size_t metadatalen = 0; + + /* attempt to retrieve object metadata from the cache */ + error = guit->llcache->meta(object->url, &metadata, &metadatalen); + if (error != NSERROR_OK) + return error; + + + + free(metadata); + + object->source_alloc = object->source_len; + + /* metadata says object stored in backing store */ + object->store_state = LLCACHE_STORE_DISC; + return NSERROR_NOT_FOUND; } @@ -1079,19 +1096,20 @@ llcache_process_metadata(llcache_object *object, uint8_t *data, size_t datasize) */ static nserror llcache_object_fetch_persistant(llcache_object *object, - uint32_t flags, - nsurl *referer, - const llcache_post_data *post, - uint32_t redirect_count) + uint32_t flags, + nsurl *referer, + const llcache_post_data *post, + uint32_t redirect_count) { nserror error; nsurl *referer_clone = NULL; llcache_post_data *post_clone = NULL; - uint8_t *metadata = NULL; - size_t metadatalen = 0; - /* attempt to retrieve object metadata from the cache */ - error = guit->llcache->meta(object->url, &metadata, &metadatalen); + object->cache.req_time = time(NULL); + object->cache.fin_time = object->cache.req_time; + + /* retrieve and process metadata */ + error = llcache_process_metadata(object); if (error != NSERROR_OK) return error; @@ -1105,27 +1123,15 @@ llcache_object_fetch_persistant(llcache_object *object, if (referer != NULL) referer_clone = nsurl_ref(referer); - object->cache.req_time = time(NULL); - object->cache.fin_time = object->cache.req_time; - object->fetch.flags = flags; object->fetch.referer = referer_clone; object->fetch.post = post_clone; object->fetch.redirect_count = redirect_count; - /* process the metadata */ - error = llcache_process_metadata(object, metadata, metadatalen); - free(metadata); - if (error != NSERROR_OK) - return error; - /* fetch is "finished" */ object->fetch.state = LLCACHE_FETCH_COMPLETE; object->fetch.fetch = NULL; - object->store_state = LLCACHE_STORE_DISC; - object->source_alloc = object->source_len; - return NSERROR_OK; } -- NetSurf Browser