Browse Source

Fixed some build errors and warnings.

August Mueller 8 years ago
parent
commit
458031a2ca

+ 6 - 6
src/extra/InMemoryOnDiskIO/FMDatabase+InMemoryOnDiskIO.m

@@ -58,41 +58,41 @@ @implementation FMDatabase (InMemoryOnDiskIO)
 - (BOOL)readFromFile:(NSString*)filePath
 {
     // only attempt to load an on-disk representation for an in-memory database
-    if ( self->_databasePath != nil ) 
+    if ( [self databasePath] != nil )
     {
         NSLog(@"Database is not an in-memory representation." );
         return NO;
     }
     
     // and only if the database is open
-    if ( self->_db == nil ) 
+    if ( [self sqliteHandle] == nil ) 
     {
         NSLog(@"Invalid database connection." );
         return NO;
     }
     
-    return ( SQLITE_OK == loadOrSaveDb( self->_db, [filePath fileSystemRepresentation], false ) );
+    return ( SQLITE_OK == loadOrSaveDb( [self sqliteHandle], [filePath fileSystemRepresentation], false ) );
 
 }
 
 - (BOOL)writeToFile:(NSString *)filePath
 {
     // only attempt to save an on-disk representation for an in-memory database
-    if ( self->_databasePath != nil )
+    if ( [self databasePath] != nil )
     {
         NSLog(@"Database is not an in-memory representation." );
         return NO;
     }
     
     // and only if the database is open
-    if ( self->_db == nil ) 
+    if ( [self sqliteHandle] == nil )
     {
         NSLog(@"Invalid database connection." );
         return NO;
     }
     
     // save the in-memory representation    
-    return ( SQLITE_OK == loadOrSaveDb( self->_db, [filePath fileSystemRepresentation], true ) );
+    return ( SQLITE_OK == loadOrSaveDb( [self sqliteHandle], [filePath fileSystemRepresentation], true ) );
 }
 
 @end

+ 1 - 1
src/fmdb/FMDatabase.m

@@ -1502,7 +1502,7 @@ - (double)valueDouble:(void *)value {
 - (NSData *)valueData:(void *)value {
     const void *bytes = sqlite3_value_blob(value);
     int length = sqlite3_value_bytes(value);
-    return bytes ? [NSData dataWithBytes:bytes length:length] : nil;
+    return bytes ? [NSData dataWithBytes:bytes length:(NSUInteger)length] : nil;
 }
 
 - (NSString *)valueString:(void *)value {

+ 3 - 3
src/sample/main.m

@@ -648,7 +648,7 @@ int main (int argc, const char * argv[]) {
         FMDBQuickCheck([[rs stringForColumn:@"t4.a"] isEqualToString:@"one"]);
         FMDBQuickCheck([[rs stringForColumn:@"b"] isEqualToString:@"two"]);
         
-        FMDBQuickCheck(strcmp((const char*)[rs UTF8StringForColumnName:@"b"], "two") == 0);
+        FMDBQuickCheck(strcmp((const char*)[rs UTF8StringForColumn:@"b"], "two") == 0);
         
         [rs close];
         
@@ -666,7 +666,7 @@ int main (int argc, const char * argv[]) {
         FMDBQuickCheck([[rs stringForColumn:@"t4.a"] isEqualToString:@"one"]);
         FMDBQuickCheck([[rs stringForColumn:@"b"] isEqualToString:@"two"]);
         
-        FMDBQuickCheck(strcmp((const char*)[rs UTF8StringForColumnName:@"b"], "two") == 0);
+        FMDBQuickCheck(strcmp((const char*)[rs UTF8StringForColumn:@"b"], "two") == 0);
         
         [rs close];
     }
@@ -1046,7 +1046,7 @@ int main (int argc, const char * argv[]) {
         [adb executeUpdate:@"insert into ftest values ('not h!')"];
         [adb executeUpdate:@"insert into ftest values ('definitely not h!')"];
         
-        [adb makeFunctionNamed:@"StringStartsWithH" maximumArguments:1 withBlock:^(/*sqlite3_context*/ void *context, int aargc, /*sqlite3_value*/ void **aargv) {
+        [adb makeFunctionNamed:@"StringStartsWithH" arguments:1 block:^(/*sqlite3_context*/ void *context, int aargc, /*sqlite3_value*/ void **aargv) {
             if (sqlite3_value_type(aargv[0]) == SQLITE_TEXT) {
                 @autoreleasepool {
                     const char *c = (const char *)sqlite3_value_text(aargv[0]);