summaryrefslogtreecommitdiff
path: root/navit/cache.c
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-01-24 15:54:02 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-01-24 15:54:02 +0000
commiteead77d7b00fd8919f1cb9297ea2074c289336d5 (patch)
tree9d944bc69d790dddfe0ae864feeb2df25fc57ae8 /navit/cache.c
parent504d9b85f9bb88083dbdc9651ff856f60c3e7828 (diff)
downloadnavit-eead77d7b00fd8919f1cb9297ea2074c289336d5.tar.gz
Fix:Core:MSVC fixes|Thanks chollya
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3971 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/cache.c')
-rw-r--r--navit/cache.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/navit/cache.c b/navit/cache.c
index f369b8d0a..0ef417525 100644
--- a/navit/cache.c
+++ b/navit/cache.c
@@ -191,9 +191,10 @@ cache_remove_lru(struct cache *cache, struct cache_entry_list *list)
void *
cache_entry_new(struct cache *cache, void *id, int size)
{
+ struct cache_entry *ret;
size+=cache->entry_size;
cache->misses+=size;
- struct cache_entry *ret=(struct cache_entry *)g_slice_alloc0(size);
+ ret=(struct cache_entry *)g_slice_alloc0(size);
ret->size=size;
ret->usage=1;
memcpy(ret->id, id, cache->id_size*sizeof(int));
@@ -211,9 +212,9 @@ cache_entry_destroy(struct cache *cache, void *data)
static struct cache_entry *
cache_trim(struct cache *cache, struct cache_entry *entry)
{
+ struct cache_entry *new_entry;
dbg(1,"trim 0x%x 0x%x 0x%x 0x%x 0x%x\n", entry->id[0], entry->id[1], entry->id[2], entry->id[3], entry->id[4]);
dbg(1,"Trim %x from %d -> %d\n", entry->id[0], entry->size, cache->size);
- struct cache_entry *new_entry;
if ( cache->entry_size < entry->size )
{
g_hash_table_remove(cache->hash, (gpointer)(entry->id));