From e922ce7b6b409bba193d8911794496188e47dd10 Mon Sep 17 00:00:00 2001 From: rbbtsn0w Date: Fri, 2 Sep 2016 15:26:47 +0800 Subject: [PATCH] Method parameter of type 'NSError *__autoreleasing *' with no explicit ownership Fixed. --- src/extra/fts3/FMTokenizers.h | 2 +- src/fmdb/FMDatabase.h | 10 +++++----- src/fmdb/FMDatabase.m | 14 +++++++------- src/fmdb/FMDatabaseAdditions.h | 2 +- src/fmdb/FMDatabaseAdditions.m | 2 +- src/fmdb/FMResultSet.h | 2 +- src/fmdb/FMResultSet.m | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/extra/fts3/FMTokenizers.h b/src/extra/fts3/FMTokenizers.h index 59bce9ca..725305bd 100644 --- a/src/extra/fts3/FMTokenizers.h +++ b/src/extra/fts3/FMTokenizers.h @@ -34,7 +34,7 @@ /** Load a stop-word tokenizer using a file containing words delimited by newlines. The file should be encoded in UTF-8. */ -+ (instancetype)tokenizerWithFileURL:(NSURL *)wordFileURL baseTokenizer:(id)tokenizer error:(NSError **)error; ++ (instancetype)tokenizerWithFileURL:(NSURL *)wordFileURL baseTokenizer:(id)tokenizer error:(NSError *__autoreleasing *)error; /** Initialize an instance of the tokenizer using the set of words. The words should be lowercase if you're using the diff --git a/src/fmdb/FMDatabase.h b/src/fmdb/FMDatabase.h index 2403dd30..b305271e 100644 --- a/src/fmdb/FMDatabase.h +++ b/src/fmdb/FMDatabase.h @@ -293,7 +293,7 @@ typedef int(^FMDBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictionary @see [`sqlite3_bind`](http://sqlite.org/c3ref/bind_blob.html) */ -- (BOOL)executeUpdate:(NSString*)sql withErrorAndBindings:(NSError**)outErr, ...; +- (BOOL)executeUpdate:(NSString*)sql withErrorAndBindings:(NSError *__autoreleasing *)outErr, ...; /** Execute single update statement @@ -302,7 +302,7 @@ typedef int(^FMDBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictionary @warning **Deprecated**: Please use `` instead. */ -- (BOOL)update:(NSString*)sql withErrorAndBindings:(NSError**)outErr, ... __attribute__ ((deprecated)); +- (BOOL)update:(NSString*)sql withErrorAndBindings:(NSError *__autoreleasing *)outErr, ... __attribute__ ((deprecated)); /** Execute single update statement @@ -899,7 +899,7 @@ typedef int(^FMDBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictionary @see rollbackToSavePointWithName:error: */ -- (BOOL)startSavePointWithName:(NSString*)name error:(NSError**)outErr; +- (BOOL)startSavePointWithName:(NSString*)name error:(NSError *__autoreleasing *)outErr; /** Release save point @@ -914,7 +914,7 @@ typedef int(^FMDBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictionary */ -- (BOOL)releaseSavePointWithName:(NSString*)name error:(NSError**)outErr; +- (BOOL)releaseSavePointWithName:(NSString*)name error:(NSError *__autoreleasing *)outErr; /** Roll back to save point @@ -928,7 +928,7 @@ typedef int(^FMDBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictionary */ -- (BOOL)rollbackToSavePointWithName:(NSString*)name error:(NSError**)outErr; +- (BOOL)rollbackToSavePointWithName:(NSString*)name error:(NSError *__autoreleasing *)outErr; /** Start save point diff --git a/src/fmdb/FMDatabase.m b/src/fmdb/FMDatabase.m index 3947241f..36472f96 100644 --- a/src/fmdb/FMDatabase.m +++ b/src/fmdb/FMDatabase.m @@ -11,7 +11,7 @@ @interface FMDatabase () - (FMResultSet *)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray*)arrayArgs orDictionary:(NSDictionary *)dictionaryArgs orVAList:(va_list)args; -- (BOOL)executeUpdate:(NSString*)sql error:(NSError**)outErr withArgumentsInArray:(NSArray*)arrayArgs orDictionary:(NSDictionary *)dictionaryArgs orVAList:(va_list)args; +- (BOOL)executeUpdate:(NSString*)sql error:(NSError *__autoreleasing *)outErr withArgumentsInArray:(NSArray*)arrayArgs orDictionary:(NSDictionary *)dictionaryArgs orVAList:(va_list)args; @end @@ -931,7 +931,7 @@ - (FMResultSet *)executeQuery:(NSString*)sql withVAList:(va_list)args { #pragma mark Execute updates -- (BOOL)executeUpdate:(NSString*)sql error:(NSError**)outErr withArgumentsInArray:(NSArray*)arrayArgs orDictionary:(NSDictionary *)dictionaryArgs orVAList:(va_list)args { +- (BOOL)executeUpdate:(NSString*)sql error:(NSError *__autoreleasing *)outErr withArgumentsInArray:(NSArray*)arrayArgs orDictionary:(NSDictionary *)dictionaryArgs orVAList:(va_list)args { if (![self databaseExists]) { return NO; @@ -1235,7 +1235,7 @@ - (BOOL)executeStatements:(NSString *)sql withResultBlock:(FMDBExecuteStatements return (rc == SQLITE_OK); } -- (BOOL)executeUpdate:(NSString*)sql withErrorAndBindings:(NSError**)outErr, ... { +- (BOOL)executeUpdate:(NSString*)sql withErrorAndBindings:(NSError *__autoreleasing *)outErr, ... { va_list args; va_start(args, outErr); @@ -1249,7 +1249,7 @@ - (BOOL)executeUpdate:(NSString*)sql withErrorAndBindings:(NSError**)outErr, ... #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-implementations" -- (BOOL)update:(NSString*)sql withErrorAndBindings:(NSError**)outErr, ... { +- (BOOL)update:(NSString*)sql withErrorAndBindings:(NSError *__autoreleasing *)outErr, ... { va_list args; va_start(args, outErr); @@ -1320,7 +1320,7 @@ - (BOOL)interrupt return [savepointName stringByReplacingOccurrencesOfString:@"'" withString:@"''"]; } -- (BOOL)startSavePointWithName:(NSString*)name error:(NSError**)outErr { +- (BOOL)startSavePointWithName:(NSString*)name error:(NSError *__autoreleasing *)outErr { #if SQLITE_VERSION_NUMBER >= 3007000 NSParameterAssert(name); @@ -1334,7 +1334,7 @@ - (BOOL)startSavePointWithName:(NSString*)name error:(NSError**)outErr { #endif } -- (BOOL)releaseSavePointWithName:(NSString*)name error:(NSError**)outErr { +- (BOOL)releaseSavePointWithName:(NSString*)name error:(NSError *__autoreleasing *)outErr { #if SQLITE_VERSION_NUMBER >= 3007000 NSParameterAssert(name); @@ -1348,7 +1348,7 @@ - (BOOL)releaseSavePointWithName:(NSString*)name error:(NSError**)outErr { #endif } -- (BOOL)rollbackToSavePointWithName:(NSString*)name error:(NSError**)outErr { +- (BOOL)rollbackToSavePointWithName:(NSString*)name error:(NSError *__autoreleasing *)outErr { #if SQLITE_VERSION_NUMBER >= 3007000 NSParameterAssert(name); diff --git a/src/fmdb/FMDatabaseAdditions.h b/src/fmdb/FMDatabaseAdditions.h index 9dd0b629..c44463cb 100644 --- a/src/fmdb/FMDatabaseAdditions.h +++ b/src/fmdb/FMDatabaseAdditions.h @@ -206,7 +206,7 @@ */ -- (BOOL)validateSQL:(NSString*)sql error:(NSError**)error; +- (BOOL)validateSQL:(NSString*)sql error:(NSError *__autoreleasing *)error; ///----------------------------------- diff --git a/src/fmdb/FMDatabaseAdditions.m b/src/fmdb/FMDatabaseAdditions.m index 61fa747e..c4596f08 100644 --- a/src/fmdb/FMDatabaseAdditions.m +++ b/src/fmdb/FMDatabaseAdditions.m @@ -223,7 +223,7 @@ - (BOOL)columnExists:(NSString*)tableName columnName:(NSString*)columnName __att #pragma clang diagnostic pop -- (BOOL)validateSQL:(NSString*)sql error:(NSError**)error { +- (BOOL)validateSQL:(NSString*)sql error:(NSError *__autoreleasing *)error { sqlite3_stmt *pStmt = NULL; BOOL validationSucceeded = YES; diff --git a/src/fmdb/FMResultSet.h b/src/fmdb/FMResultSet.h index af0433b4..73e5b7db 100644 --- a/src/fmdb/FMResultSet.h +++ b/src/fmdb/FMResultSet.h @@ -93,7 +93,7 @@ @see hasAnotherRow */ -- (BOOL)nextWithError:(NSError **)outErr; +- (BOOL)nextWithError:(NSError *__autoreleasing *)outErr; /** Did the last call to `` succeed in retrieving another row? diff --git a/src/fmdb/FMResultSet.m b/src/fmdb/FMResultSet.m index cfc51e11..51a87b22 100644 --- a/src/fmdb/FMResultSet.m +++ b/src/fmdb/FMResultSet.m @@ -156,7 +156,7 @@ - (BOOL)next { return [self nextWithError:nil]; } -- (BOOL)nextWithError:(NSError **)outErr { +- (BOOL)nextWithError:(NSError *__autoreleasing *)outErr { int rc = sqlite3_step([_statement statement]);