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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 94ff1f92b299b7bd667d2356079c41c977041bcd
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 2 23:34:10 2002 +0000

            Changes to get rid of logging from our non-development builds. We now define
            xNDEBUG (will be NDEBUG some day if we can resolve the precompiled header issue)
            for any non-development builds, and compile out logging code for those.
    
            * CacheLoader.subproj/IFURLCacheLoaderConstantsPrivate.h: Update comment.
    
    	* CacheLoader.subproj/IFHTTPURLProtocolHandler.m:
    	* CacheLoader.subproj/IFURLDiskCache.m:
    	* CacheLoader.subproj/IFURLHandle.m:
    	* CacheLoader.subproj/IFURLLoad.m:
            * CacheLoader.subproj/IFURLMemoryCache.m:
            Change callers to use macros instead of doing their own ifdefs in most cases.
            In the other cases, use an ifdef on xNDEBUG.
    
    	* Misc.subproj/WebFoundationDebug.h: Put in empty definitions for the xNDEBUG
            case. Also make macros for logging, not just debugging.
    
    	* Misc.subproj/WebFoundationDebug.m: Don't compile any of this when xNDEBUG is
            set.
    
    	* WebFoundation.pbproj/project.pbxproj: Remove the unused build style. Make
            the default build style set xNDEBUG using DEBUG_CFLAGS. Move our warning flags
            into WARNING_CFLAGS. Make the Development style override DEBUG_CFLAGS. Some
            other minor build setting cleanups.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@943 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index eeefe2a..224bf82 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -125,20 +125,16 @@ static void URLFileReaderInit()
     }
     
     if (data) {
-#ifdef WEBFOUNDATION_DEBUG
         if (mappedBytes) {
-            WebFoundationLogAtLevel(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - mmaped disk cache file - %@", path);
+            WEBFOUNDATIONLOGLEVEL1(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - mmaped disk cache file - %@", path);
         }
         else {
-            WebFoundationLogAtLevel(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - fs read disk cache file - %@", path);
+            WEBFOUNDATIONLOGLEVEL1(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - fs read disk cache file - %@", path);
         }
-#endif
         return self;
     }
     else {
-#ifdef WEBFOUNDATION_DEBUG
-        WebFoundationLogAtLevel(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - no disk cache file - %@", path);
-#endif
+        WEBFOUNDATIONLOGLEVEL1(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - no disk cache file - %@", path);
         [self dealloc];
         return nil;
     }
@@ -371,9 +367,7 @@ static void URLFileReaderInit()
     [self open];
     [mutex unlock];
 
-#ifdef WEBFOUNDATION_DEBUG
-    WebFoundationLogAtLevel(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - removeAllObjects");
-#endif
+    WEBFOUNDATIONLOGLEVEL(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - removeAllObjects");
 }
 
 -(id)objectForKey:(id)key
@@ -424,9 +418,7 @@ static void URLFileReaderInit()
             }
         }
     NS_HANDLER
-#ifdef WEBFOUNDATION_DEBUG
-        WebFoundationLogAtLevel(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - cannot unarchive cache file - %@", key);
-#endif
+        WEBFOUNDATIONLOGLEVEL1(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - cannot unarchive cache file - %@", key);
         result = nil;
     NS_ENDHANDLER
 
@@ -454,9 +446,7 @@ static void URLFileReaderInit()
     NSArchiver *archiver;
     NSFileManager *defaultManager;
 
-#ifdef WEBFOUNDATION_DEBUG
-    WebFoundationLogAtLevel(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - performSetObject - %@ - %@", key, [IFURLFileDatabase uniqueFilePathForKey:key]);
-#endif
+    WEBFOUNDATIONLOGLEVEL2(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - performSetObject - %@ - %@", key, [IFURLFileDatabase uniqueFilePathForKey:key]);
 
     result = NO;
 
@@ -496,9 +486,7 @@ static void URLFileReaderInit()
 {
     NSString *filePath;
 
-#ifdef WEBFOUNDATION_DEBUG
-    WebFoundationLogAtLevel(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - performRemoveObjectForKey - %@", key);
-#endif
+    WEBFOUNDATIONLOGLEVEL1(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - performRemoveObjectForKey - %@", key);
 
     filePath = [[NSString alloc] initWithFormat:@"%@/%@", path, [IFURLFileDatabase uniqueFilePathForKey:key]];
     [[NSFileManager defaultManager] removeFileAtPath:filePath handler:nil];

-- 
WebKit Debian packaging