[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:01:06 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f37f07698d8a034255552eaac119ccfeca4a48d5
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Apr 3 06:08:22 2002 +0000
* CacheLoader.subproj/IFHTTPURLProtocolHandler.m:
* CacheLoader.subproj/IFMutableData.m:
* CacheLoader.subproj/IFMutableDataPrivate.m:
* CacheLoader.subproj/IFURLDiskCache.m:
* CacheLoader.subproj/IFURLHandle.m:
* CacheLoader.subproj/IFURLHandleCGlue.m:
* CacheLoader.subproj/IFURLLoad.m:
* CacheLoader.subproj/IFURLMemoryCache.m:
* Database.subproj/IFURLFileDatabase.m:
* Database.subproj/IFNDBMDatabase.m:
* Misc.subproj/IFLockFile.m:
Add the newlines I omitted in my previous commits.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@946 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index df2037e..06f1c80 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", [path lossyCString]);
+ WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - mmaped disk cache file - %s\n", [path lossyCString]);
}
else {
- WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - fs read disk cache file - %s", [path lossyCString]);
+ WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - fs read disk cache file - %s\n", [path lossyCString]);
}
return self;
}
else {
- WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - no disk cache file - %s", [path lossyCString]);
+ WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - no disk cache file - %s\n", [path lossyCString]);
[self dealloc];
return nil;
}
@@ -367,7 +367,7 @@ static void URLFileReaderInit()
[self open];
[mutex unlock];
- WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - removeAllObjects");
+ WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - removeAllObjects\n");
}
-(id)objectForKey:(id)key
@@ -418,7 +418,7 @@ static void URLFileReaderInit()
}
}
NS_HANDLER
- WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - cannot unarchive cache file - %s", DEBUG_OBJECT(key));
+ WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - cannot unarchive cache file - %s\n", 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",
+ WEBFOUNDATIONDEBUGLEVEL2(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - performSetObject - %s - %s\n",
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", DEBUG_OBJECT(key));
+ WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - performRemoveObjectForKey - %s\n", DEBUG_OBJECT(key));
filePath = [[NSString alloc] initWithFormat:@"%@/%@", path, [IFURLFileDatabase uniqueFilePathForKey:key]];
[[NSFileManager defaultManager] removeFileAtPath:filePath handler:nil];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list