Jelajahi Sumber

Added some warnings, and fixed some warnings.

August Mueller 11 tahun lalu
induk
melakukan
287cff6905
2 mengubah file dengan 24 tambahan dan 22 penghapusan
  1. 2 0
      fmdb.xcodeproj/project.pbxproj
  2. 22 22
      src/fmdb/FMDatabasePool.m

+ 2 - 0
fmdb.xcodeproj/project.pbxproj

@@ -506,6 +506,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -525,6 +526,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G5;

+ 22 - 22
src/fmdb/FMDatabasePool.m

@@ -87,12 +87,12 @@ - (void)pushDatabaseBackInPool:(FMDatabase*)db {
     
     [self executeLocked:^() {
         
-        if ([_databaseInPool containsObject:db]) {
+        if ([self->_databaseInPool containsObject:db]) {
             [[NSException exceptionWithName:@"Database already in pool" reason:@"The FMDatabase being put back into the pool is already present in the pool" userInfo:nil] raise];
         }
         
-        [_databaseInPool addObject:db];
-        [_databaseOutPool removeObject:db];
+        [self->_databaseInPool addObject:db];
+        [self->_databaseOutPool removeObject:db];
         
     }];
 }
@@ -103,53 +103,53 @@ - (FMDatabase*)db {
     
     
     [self executeLocked:^() {
-        db = [_databaseInPool lastObject];
+        db = [self->_databaseInPool lastObject];
         
         BOOL shouldNotifyDelegate = NO;
         
         if (db) {
-            [_databaseOutPool addObject:db];
-            [_databaseInPool removeLastObject];
+            [self->_databaseOutPool addObject:db];
+            [self->_databaseInPool removeLastObject];
         }
         else {
             
-            if (_maximumNumberOfDatabasesToCreate) {
-                NSUInteger currentCount = [_databaseOutPool count] + [_databaseInPool count];
+            if (self->_maximumNumberOfDatabasesToCreate) {
+                NSUInteger currentCount = [self->_databaseOutPool count] + [self->_databaseInPool count];
                 
-                if (currentCount >= _maximumNumberOfDatabasesToCreate) {
+                if (currentCount >= self->_maximumNumberOfDatabasesToCreate) {
                     NSLog(@"Maximum number of databases (%ld) has already been reached!", (long)currentCount);
                     return;
                 }
             }
             
-            db = [FMDatabase databaseWithPath:_path];
+            db = [FMDatabase databaseWithPath:self->_path];
             shouldNotifyDelegate = YES;
         }
         
         //This ensures that the db is opened before returning
 #if SQLITE_VERSION_NUMBER >= 3005000
-        BOOL success = [db openWithFlags:_openFlags];
+        BOOL success = [db openWithFlags:self->_openFlags];
 #else
         BOOL success = [db open];
 #endif
         if (success) {
-            if ([_delegate respondsToSelector:@selector(databasePool:shouldAddDatabaseToPool:)] && ![_delegate databasePool:self shouldAddDatabaseToPool:db]) {
+            if ([self->_delegate respondsToSelector:@selector(databasePool:shouldAddDatabaseToPool:)] && ![self->_delegate databasePool:self shouldAddDatabaseToPool:db]) {
                 [db close];
                 db = 0x00;
             }
             else {
                 //It should not get added in the pool twice if lastObject was found
-                if (![_databaseOutPool containsObject:db]) {
-                    [_databaseOutPool addObject:db];
+                if (![self->_databaseOutPool containsObject:db]) {
+                    [self->_databaseOutPool addObject:db];
                     
-                    if (shouldNotifyDelegate && [_delegate respondsToSelector:@selector(databasePool:didAddDatabase:)]) {
-                        [_delegate databasePool:self didAddDatabase:db];
+                    if (shouldNotifyDelegate && [self->_delegate respondsToSelector:@selector(databasePool:didAddDatabase:)]) {
+                        [self->_delegate databasePool:self didAddDatabase:db];
                     }
                 }
             }
         }
         else {
-            NSLog(@"Could not open up the database at path %@", _path);
+            NSLog(@"Could not open up the database at path %@", self->_path);
             db = 0x00;
         }
     }];
@@ -162,7 +162,7 @@ - (NSUInteger)countOfCheckedInDatabases {
     __block NSUInteger count;
     
     [self executeLocked:^() {
-        count = [_databaseInPool count];
+        count = [self->_databaseInPool count];
     }];
     
     return count;
@@ -173,7 +173,7 @@ - (NSUInteger)countOfCheckedOutDatabases {
     __block NSUInteger count;
     
     [self executeLocked:^() {
-        count = [_databaseOutPool count];
+        count = [self->_databaseOutPool count];
     }];
     
     return count;
@@ -183,7 +183,7 @@ - (NSUInteger)countOfOpenDatabases {
     __block NSUInteger count;
     
     [self executeLocked:^() {
-        count = [_databaseOutPool count] + [_databaseInPool count];
+        count = [self->_databaseOutPool count] + [self->_databaseInPool count];
     }];
     
     return count;
@@ -191,8 +191,8 @@ - (NSUInteger)countOfOpenDatabases {
 
 - (void)releaseAllDatabases {
     [self executeLocked:^() {
-        [_databaseOutPool removeAllObjects];
-        [_databaseInPool removeAllObjects];
+        [self->_databaseOutPool removeAllObjects];
+        [self->_databaseInPool removeAllObjects];
     }];
 }