[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 892d7949b723944ddd704caa7de822f322f737f5
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 23 21:44:07 2002 +0000

    	Changes to the WebCache interface to bring it closer into line
            with the current API proposal. Changes in other classes have been made to
            keep up with the WebCache changes.
    
    	Added removeCacheObjectForKey method.
    	Renamed cacheVars pointer in WebCache header to more "standard" _private.
    	Changed names of private methods so that they begin with underscores.
    
            * CacheLoader.subproj/WebCache.h:
            * CacheLoader.subproj/WebCache.m:
            (-[WebCache initWithSizeLimit:])
            (-[WebCache removeCacheObjectForKey:])
            (-[WebCache sizeLimit])
            (-[WebCache setSizeLimit:])
            (-[WebCache objectSizeLimit])
            (-[WebCache setObjectSizeLimit:])
            (-[WebCache currentUsage])
            (-[WebCache clearCache])
            (-[WebCache dealloc])
            (-[WebCache _syncCache])
            (-[WebCache _setCurrentUsage:])
            (-[WebCache _truncateToSizeLimit:])
            * CacheLoader.subproj/WebCachePrivate.h:
            * CacheLoader.subproj/WebDiskCache.m:
            (-[WebDiskCache removeCacheObjectForKey:])
            (-[WebDiskCache _syncCache])
            (-[WebDiskCache _truncateToSizeLimit:])
            * CacheLoader.subproj/WebMemoryCache.m:
            (-[WebMemoryCache _truncateToSizeLimit])
            (-[WebMemoryCache storeCacheObject:forKey:])
            (-[WebMemoryCache removeCacheObjectForKey:])
            (-[WebMemoryCache clearCache])
            * CacheLoader.subproj/WebResourceLoadManager.m:
            (-[WebResourceLoadManager syncAllCaches])
            * Database.subproj/WebFileDatabase.m:
            (-[WebFileDatabase _truncateToSizeLimit:])
            (-[WebFileDatabase performSetObject:forKey:])
            (-[WebFileDatabase setSizeLimit:])
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2127 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index dacf674..7ab7ac0 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -321,7 +321,7 @@ static void URLFileReaderInit(void)
 +(NSString *)uniqueFilePathForKey:(id)key;
 -(void)writeSizeFile:(unsigned)value;
 -(unsigned)readSizeFile;
--(void)truncateToSizeLimit:(unsigned)size;
+-(void)_truncateToSizeLimit:(unsigned)size;
 
 @end
 
@@ -403,7 +403,7 @@ static void URLFileReaderInit(void)
     return result;
 }
 
--(void)truncateToSizeLimit:(unsigned)size
+-(void)_truncateToSizeLimit:(unsigned)size
 {
     NSFileManager *defaultManager;
     NSDictionary *attributes;
@@ -432,7 +432,7 @@ static void URLFileReaderInit(void)
                 fileSize = [attributes objectForKey:NSFileSize];
                 if (fileSize) {
                     usage -= [fileSize unsignedIntValue];
-                    LOG(DiskCacheActivity, "truncateToSizeLimit - %u - %u - %u, %@", size, usage, [fileSize unsignedIntValue], spec->path);
+                    LOG(DiskCacheActivity, "_truncateToSizeLimit - %u - %u - %u, %@", size, usage, [fileSize unsignedIntValue], spec->path);
                     [defaultManager removeFileAtPath:spec->path handler:nil];
                 }
             }
@@ -666,7 +666,7 @@ static void databaseInit()
     // update usage and truncate before writing file
     // this has the effect of _always_ keeping disk usage under sizeLimit by clearing away space in anticipation of the write.
     usage += [data length];
-    [self truncateToSizeLimit:[self sizeLimit]];
+    [self _truncateToSizeLimit:[self sizeLimit]];
 
     result = [defaultManager _web_createFileAtPathWithIntermediateDirectories:filePath contents:data attributes:attributes directoryAttributes:directoryAttributes];
 
@@ -834,7 +834,7 @@ static void databaseInit()
 {
     sizeLimit = limit;
     if (limit < usage) {
-        [self truncateToSizeLimit:limit];
+        [self _truncateToSizeLimit:limit];
     }
 }
 

-- 
WebKit Debian packaging