[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 4b45c64e02b04da2b874e5cbf48f3757fa569bc0
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 3 15:17:02 2002 +0000

    2002-04-03  Ken Kocienda  <kocienda at apple.com>
    
            Labyrinth:
    
            Updated tests to handle new WebFoundation logging output.
    
            * Tests/WebFoundation-CacheLoader/never-expires-test:
            * Tests/WebFoundation-CacheLoader/never-expires-test.chk:
    
    
            WebFoundation:
    
            Many logging changes.
    
            - Removed all DEBUG1, DEBUG2, ... variants, and replaced with a single
              macro that relies on cpp varargs (a new cpp feature that landed recently)
    
            - Updated log messages to be more consistent. Messages now log a time, and
              the string [WEBFOUNDATION] by default.
    
            - Touched all debugging calls to clean them up and bring them into line
              with the new conventions.
    
            * CacheLoader.subproj/IFHTTPURLProtocolHandler.m: (+[IFHTTPURLProtocolHandler
            parseHTTPDateString:]), (-[IFHTTPURLProtocolHandler createHTTPRequest]),
            (-[IFHTTPURLProtocolHandler performHTTPHeaderRead:]), (-[IFHTTPURLProtocolHandler
            setResponseHeaders:]), (-[IFHTTPURLProtocolHandler determineError]),
            (-[IFHTTPURLProtocolHandler willReturnCacheObject:]), (-[IFHTTPURLProtocolHandler
            cacheObjectIsValid:]), (-[IFHTTPURLProtocolHandler
            cacheObjectRequiresRevalidation:]), (-[IFHTTPURLProtocolHandler
            shouldCacheResourceData]):
            * CacheLoader.subproj/IFURLCacheLoaderConstantsPrivate.h:
            * CacheLoader.subproj/IFURLDiskCache.m: (-[IFURLDiskCache objectForURL:]),
            (-[IFURLDiskCache invalidateURL:]), (-[IFURLDiskCache clearCache]),
            (-[IFURLDiskCache syncCache]):
            * CacheLoader.subproj/IFURLHandle.m: (-[IFURLHandle
            notifyClientsBackgroundLoadCancelled]), (-[IFURLHandle
            notifyClientsBackgroundLoadDidBegin]), (-[IFURLHandle notifyClientsDidLoadData]),
            (-[IFURLHandle notifyClientsBackgroundLoadComplete]), (-[IFURLHandle
            notifyClientsBackgroundLoadFailed]), (-[IFURLHandle notifyClientsURLRedirected]):
            * CacheLoader.subproj/IFURLLoad.m: (-[IFURLLoad succeeded]), (-[IFURLLoad
            didBeginLoading:]), (+[IFURLLoad IFURLLoadCacheCheckerRun:]), (_loadSweeper):
            * CacheLoader.subproj/IFURLMemoryCache.m: (-[IFURLMemoryCache
            truncateToSizeLimit]), (-[IFURLMemoryCache objectForURL:]):
            * Database.subproj/IFNDBMDatabase.m: (-[IFNDBMDatabase objectForKey:]):
            * Database.subproj/IFURLFileDatabase.m: (-[IFURLFileReader initWithPath:]),
            (-[IFURLFileDatabase removeAllObjects]), (-[IFURLFileDatabase objectForKey:]),
            (-[IFURLFileDatabase performSetObject:forKey:]), (-[IFURLFileDatabase
            performRemoveObjectForKey:]):
            * Misc.subproj/WebFoundationDebug.h:
            * Misc.subproj/WebFoundationDebug.m: (WebFoundationDebugAtLevel):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@950 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 06f1c80..baca962 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -126,15 +126,15 @@ static void URLFileReaderInit()
     
     if (data) {
         if (mappedBytes) {
-            WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - mmaped disk cache file - %s\n", [path lossyCString]);
+            WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "mmaped disk cache file - %s", [path lossyCString]);
         }
         else {
-            WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - fs read disk cache file - %s\n", [path lossyCString]);
+            WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "fs read disk cache file - %s", [path lossyCString]);
         }
         return self;
     }
     else {
-        WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - no disk cache file - %s\n", [path lossyCString]);
+        WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "no disk cache file - %s", [path lossyCString]);
         [self dealloc];
         return nil;
     }
@@ -367,7 +367,7 @@ static void URLFileReaderInit()
     [self open];
     [mutex unlock];
 
-    WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - removeAllObjects\n");
+    WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "removeAllObjects");
 }
 
 -(id)objectForKey:(id)key
@@ -418,7 +418,7 @@ static void URLFileReaderInit()
             }
         }
     NS_HANDLER
-        WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - cannot unarchive cache file - %s\n", DEBUG_OBJECT(key));
+        WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "cannot unarchive cache file - %s", DEBUG_OBJECT(key));
         result = nil;
     NS_ENDHANDLER
 
@@ -446,7 +446,7 @@ static void URLFileReaderInit()
     NSArchiver *archiver;
     NSFileManager *defaultManager;
 
-    WEBFOUNDATIONDEBUGLEVEL2(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - performSetObject - %s - %s\n",
+    WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "performSetObject - %s - %s",
         DEBUG_OBJECT(key), DEBUG_OBJECT([IFURLFileDatabase uniqueFilePathForKey:key]));
 
     result = NO;
@@ -487,7 +487,7 @@ static void URLFileReaderInit()
 {
     NSString *filePath;
 
-    WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - performRemoveObjectForKey - %s\n", DEBUG_OBJECT(key));
+    WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "performRemoveObjectForKey - %s", DEBUG_OBJECT(key));
 
     filePath = [[NSString alloc] initWithFormat:@"%@/%@", path, [IFURLFileDatabase uniqueFilePathForKey:key]];
     [[NSFileManager defaultManager] removeFileAtPath:filePath handler:nil];

-- 
WebKit Debian packaging