[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:37:41 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c438ef0d75ac185a5b719244e79aa7d9218f2879
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Apr 17 23:20:55 2003 +0000
Reviewed by Darin.
- fix build on latest Panther due to conflicts with the latest Foundation.
* Database.subproj/WebDatabase.h:
* Database.subproj/WebDatabase.m:
(-[WebDatabase open]): Removed boolean return.
(-[WebDatabase close]): Likewise.
* Database.subproj/WebFileDatabase.m:
(-[WebFileDatabase open]): Likewise.
(-[WebFileDatabase close]): Likewise.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4133 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Misc.subproj/WebDatabase.h b/WebKit/Misc.subproj/WebDatabase.h
index 9c69995..4cac15e 100644
--- a/WebKit/Misc.subproj/WebDatabase.h
+++ b/WebKit/Misc.subproj/WebDatabase.h
@@ -31,8 +31,8 @@
@interface WebDatabase (WebDatabaseManagement)
--(BOOL)open;
--(BOOL)close;
+-(void)open;
+-(void)close;
-(void)sync;
-(NSString *)path;
diff --git a/WebKit/Misc.subproj/WebDatabase.m b/WebKit/Misc.subproj/WebDatabase.m
index 62a60bc..4ba07aa 100644
--- a/WebKit/Misc.subproj/WebDatabase.m
+++ b/WebKit/Misc.subproj/WebDatabase.m
@@ -71,16 +71,14 @@
@implementation WebDatabase (WebDatabaseManagement)
--(BOOL)open
+-(void)open
{
NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
- return NO;
}
--(BOOL)close
+-(void)close
{
NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
- return NO;
}
-(void)sync
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 95a23f1..fcc04a5 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -510,7 +510,7 @@ static void databaseInit()
// database management functions ---------------------------------------------------------------------------
#pragma mark database management functions
--(BOOL)open
+-(void)open
{
NSFileManager *manager;
NSDictionary *attributes;
@@ -541,11 +541,9 @@ static void databaseInit()
[NSThread detachNewThreadSelector:@selector(_createLRUList:) toTarget:self withObject:nil];
}
}
-
- return isOpen;
}
--(BOOL)close
+-(void)close
{
if (isOpen) {
isOpen = NO;
@@ -554,8 +552,6 @@ static void databaseInit()
lru = NULL;
}
}
-
- return YES;
}
-(void)lazySync:(NSTimer *)theTimer
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list