diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-10-07 20:22:36 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-10-07 20:22:36 +0000 |
| commit | df2500a7308c5d02b537c8ee10e017461d13cbce (patch) | |
| tree | ac67972bfb17e2ef825211931a9e28ebbaa55118 /navit/file.c | |
| parent | 0acd20a8d2e64e283622614a11e847a467cf9f5e (diff) | |
| download | navit-df2500a7308c5d02b537c8ee10e017461d13cbce.tar.gz | |
Fix:Core:Obey file->cache
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4832 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/file.c')
| -rw-r--r-- | navit/file.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/navit/file.c b/navit/file.c index 5215378a0..6c530be66 100644 --- a/navit/file.c +++ b/navit/file.c @@ -358,7 +358,7 @@ file_data_read(struct file *file, long long offset, int size) return NULL; if (file->begin) return file->begin+offset; - if (file_cache) { + if (file->cache) { struct file_cache_id id={offset,size,file->name_id,0}; ret=cache_lookup(file_cache,&id); if (ret) @@ -475,7 +475,7 @@ file_data_read_all(struct file *file) void file_data_flush(struct file *file, long long offset, int size) { - if (file_cache) { + if (file->cache) { struct file_cache_id id={offset,size,file->name_id,0}; cache_flush(file_cache,&id); dbg(1,"Flushing "LONGLONG_FMT" %d bytes\n",offset,size); @@ -501,6 +501,7 @@ file_get_contents(char *name, unsigned char **buffer, int *size) file=file_create(name, 0); if (!file) return 0; + file->cache=0; *size=file_size(file); *buffer=file_data_read_all(file); file_destroy(file); @@ -545,7 +546,7 @@ file_data_read_compressed(struct file *file, long long offset, int size, int siz char *buffer = 0; uLongf destLen=size_uncomp; - if (file_cache) { + if (file->cache) { struct file_cache_id id={offset,size,file->name_id,1}; ret=cache_lookup(file_cache,&id); if (ret) @@ -579,7 +580,7 @@ file_data_read_encrypted(struct file *file, long long offset, int size, int size unsigned char *buffer = 0; uLongf destLen=size_uncomp; - if (file_cache) { + if (file->cache) { struct file_cache_id id={offset,size,file->name_id,1}; ret=cache_lookup(file_cache,&id); if (ret) |