[Navit-cvs-commit] SF.net SVN: navit:[4832] trunk/navit/navit/file.c

[<mar...@us...>]

Revision: 4832
          http://navit.svn.sourceforge.net/navit/?rev=4832&view=rev
Author:   martin-s
Date:     2011-10-07 20:22:36 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
Fix:Core:Obey file->cache

Modified Paths:
--------------
    trunk/navit/navit/file.c

Modified: trunk/navit/navit/file.c
===================================================================
--- trunk/navit/navit/file.c	2011-10-06 22:35:08 UTC (rev 4831)
+++ trunk/navit/navit/file.c	2011-10-07 20:22:36 UTC (rev 4832)
@@ -358,7 +358,7 @@
 		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 @@
 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=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 @@
 	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 @@
 	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)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.