Cleanup

5 files changed, 28 insertions, 30 deletions

diff --git a/src/fmdb/FMDatabase.m b/src/fmdb/FMDatabase.m
index a69bc81..d647732 100644
--- a/src/fmdb/FMDatabase.m
+++ b/src/fmdb/FMDatabase.m
@@ -627,20 +627,20 @@ static int FMDBDatabaseBusyHandler(void *f, int count) {
 - (FMResultSet *)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray*)arrayArgs orDictionary:(NSDictionary *)dictionaryArgs orVAList:(va_list)args {
     
     if (![self databaseExists]) {
-        return 0x00;
+        return nil;
     }
     
     if (_isExecutingStatement) {
         [self warnInUse];
-        return 0x00;
+        return nil;
     }
     
     _isExecutingStatement = YES;
     
-    int rc                  = 0x00;
-    sqlite3_stmt *pStmt     = 0x00;
-    FMStatement *statement  = 0x00;
-    FMResultSet *rs         = 0x00;
+    int rc                  = SQLITE_OK;
+    sqlite3_stmt *pStmt     = nil;
+    FMStatement *statement  = nil;
+    FMResultSet *rs         = nil;
     
     if (_traceExecution && sql) {
         NSLog(@"%@ executeQuery: %@", self, sql);
@@ -648,7 +648,7 @@ static int FMDBDatabaseBusyHandler(void *f, int count) {
     
     if (_shouldCacheStatements) {
         statement = [self cachedStatementForQuery:sql];
-        pStmt = statement ? [statement statement] : 0x00;
+        pStmt = statement ? [statement statement] : nil;
         [statement reset];
     }
     
@@ -811,11 +811,9 @@ static int FMDBDatabaseBusyHandler(void *f, int count) {
     
     _isExecutingStatement = YES;
     
-    #pragma message "FIXME: chagne all the 0x00's to nils."
-    
-    int rc                   = 0x00;
-    sqlite3_stmt *pStmt      = 0x00;
-    FMStatement *cachedStmt  = 0x00;
+    int rc                   = SQLITE_OK;
+    sqlite3_stmt *pStmt      = nil;
+    FMStatement *cachedStmt  = nil;
     
     if (_traceExecution && sql) {
         NSLog(@"%@ executeUpdate: %@", self, sql);
@@ -823,7 +821,7 @@ static int FMDBDatabaseBusyHandler(void *f, int count) {
     
     if (_shouldCacheStatements) {
         cachedStmt = [self cachedStatementForQuery:sql];
-        pStmt = cachedStmt ? [cachedStmt statement] : 0x00;
+        pStmt = cachedStmt ? [cachedStmt statement] : nil;
         [cachedStmt reset];
     }
     
@@ -1214,7 +1212,7 @@ static NSString *FMDBEscapeSavePointName(NSString *savepointName) {
     
     BOOL shouldRollback = NO;
     
-    NSError *err = 0x00;
+    NSError *err = nil;
     
     if (![self startSavePointWithName:name error:&err]) {
         return err;
@@ -1285,9 +1283,9 @@ void FMDBBlockSQLiteCallBackFunction(sqlite3_context *context, int argc, sqlite3
     
     /* I tried adding custom functions to release the block when the connection is destroyed- but they seemed to never be called, so we use _openFunctions to store the values instead. */
 #if ! __has_feature(objc_arc)
-    sqlite3_create_function([self sqliteHandle], [name UTF8String], count, SQLITE_UTF8, (void*)b, &FMDBBlockSQLiteCallBackFunction, 0x00, 0x00);
+    sqlite3_create_function([self sqliteHandle], [name UTF8String], count, SQLITE_UTF8, (void*)b, &FMDBBlockSQLiteCallBackFunction, nil, nil);
 #else
-    sqlite3_create_function([self sqliteHandle], [name UTF8String], count, SQLITE_UTF8, (__bridge void*)b, &FMDBBlockSQLiteCallBackFunction, 0x00, 0x00);
+    sqlite3_create_function([self sqliteHandle], [name UTF8String], count, SQLITE_UTF8, (__bridge void*)b, &FMDBBlockSQLiteCallBackFunction, nil, nil);
 #endif
 }
 
@@ -1314,7 +1312,7 @@ void FMDBBlockSQLiteCallBackFunction(sqlite3_context *context, int argc, sqlite3
 - (void)close {
     if (_statement) {
         sqlite3_finalize(_statement);
-        _statement = 0x00;
+        _statement = nil;
     }
     
     _inUse = NO;
diff --git a/src/fmdb/FMDatabaseAdditions.m b/src/fmdb/FMDatabaseAdditions.m
index a275071..058e731 100644
--- a/src/fmdb/FMDatabaseAdditions.m
+++ b/src/fmdb/FMDatabaseAdditions.m
@@ -25,7 +25,7 @@
 #define RETURN_RESULT_FOR_QUERY_WITH_SELECTOR(type, sel)             \
 va_list args;                                                        \
 va_start(args, query);                                               \
-FMResultSet *resultSet = [self executeQuery:query withArgumentsInArray:0x00 orDictionary:0x00 orVAList:args];   \
+FMResultSet *resultSet = [self executeQuery:query withArgumentsInArray:nil orDictionary:nil orVAList:args];   \
 va_end(args);                                                        \
 if (![resultSet next]) { return (type)0; }                           \
 type ret = [resultSet sel:0];                                        \
diff --git a/src/fmdb/FMDatabasePool.m b/src/fmdb/FMDatabasePool.m
index eff4f7b..4c9bfd5 100755
--- a/src/fmdb/FMDatabasePool.m
+++ b/src/fmdb/FMDatabasePool.m
@@ -74,14 +74,14 @@
 
 - (void)dealloc {
     
-    _delegate = 0x00;
+    _delegate = nil;
     FMDBRelease(_path);
     FMDBRelease(_databaseInPool);
     FMDBRelease(_databaseOutPool);
     
     if (_lockQueue) {
         FMDBDispatchQueueRelease(_lockQueue);
-        _lockQueue = 0x00;
+        _lockQueue = nil;
     }
 #if ! __has_feature(objc_arc)
     [super dealloc];
@@ -149,7 +149,7 @@
         if (success) {
             if ([self->_delegate respondsToSelector:@selector(databasePool:shouldAddDatabaseToPool:)] && ![self->_delegate databasePool:self shouldAddDatabaseToPool:db]) {
                 [db close];
-                db = 0x00;
+                db = nil;
             }
             else {
                 //It should not get added in the pool twice if lastObject was found
@@ -164,7 +164,7 @@
         }
         else {
             NSLog(@"Could not open up the database at path %@", self->_path);
-            db = 0x00;
+            db = nil;
         }
     }];
     
@@ -263,7 +263,7 @@
     
     FMDatabase *db = [self db];
     
-    NSError *err = 0x00;
+    NSError *err = nil;
     
     if (![db startSavePointWithName:name error:&err]) {
         [self pushDatabaseBackInPool:db];
diff --git a/src/fmdb/FMDatabaseQueue.m b/src/fmdb/FMDatabaseQueue.m
index 855361e..edbba39 100755
--- a/src/fmdb/FMDatabaseQueue.m
+++ b/src/fmdb/FMDatabaseQueue.m
@@ -75,7 +75,7 @@ static const void * const kDispatchQueueSpecificKey = &kDispatchQueueSpecificKey
         if (!success) {
             NSLog(@"Could not create database queue for path %@", aPath);
             FMDBRelease(self);
-            return 0x00;
+            return nil;
         }
         
         _path = FMDBReturnRetained(aPath);
@@ -111,7 +111,7 @@ static const void * const kDispatchQueueSpecificKey = &kDispatchQueueSpecificKey
     
     if (_queue) {
         FMDBDispatchQueueRelease(_queue);
-        _queue = 0x00;
+        _queue = nil;
     }
 #if ! __has_feature(objc_arc)
     [super dealloc];
@@ -123,7 +123,7 @@ static const void * const kDispatchQueueSpecificKey = &kDispatchQueueSpecificKey
     dispatch_sync(_queue, ^() {
         [self->_db close];
         FMDBRelease(_db);
-        self->_db = 0x00;
+        self->_db = nil;
     });
     FMDBRelease(self);
 }
@@ -140,8 +140,8 @@ static const void * const kDispatchQueueSpecificKey = &kDispatchQueueSpecificKey
         if (!success) {
             NSLog(@"FMDatabaseQueue could not reopen database for path %@", _path);
             FMDBRelease(_db);
-            _db  = 0x00;
-            return 0x00;
+            _db  = nil;
+            return nil;
         }
     }
     
@@ -233,7 +233,7 @@ static const void * const kDispatchQueueSpecificKey = &kDispatchQueueSpecificKey
 - (NSError*)inSavePoint:(void (^)(FMDatabase *db, BOOL *rollback))block {
 #if SQLITE_VERSION_NUMBER >= 3007000
     static unsigned long savePointIdx = 0;
-    __block NSError *err = 0x00;
+    __block NSError *err = nil;
     FMDBRetain(self);
     dispatch_sync(_queue, ^() { 
         
diff --git a/src/sample/main.m b/src/sample/main.m
index a0941b9..894ef7f 100644
--- a/src/sample/main.m
+++ b/src/sample/main.m
@@ -177,7 +177,7 @@ int main (int argc, const char * argv[]) {
         NSLog(@"Err %d: %@", [db lastErrorCode], [db lastErrorMessage]);
     }
     
-    NSError *err = 0x00;
+    NSError *err = nil;
     FMDBQuickCheck(![db executeUpdate:@"blah blah blah" withErrorAndBindings:&err]);
     FMDBQuickCheck(err != nil);
     FMDBQuickCheck([err code] == SQLITE_ERROR);