Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Method parameter of type 'NSError *__autoreleasing *' with no explici… #526

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Method parameter of type 'NSError *__autoreleasing *' with no explici… #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/extra/fts3/FMTokenizers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<FMTokenizerDelegate>)tokenizer error:(NSError **)error;
+ (instancetype)tokenizerWithFileURL:(NSURL *)wordFileURL baseTokenizer:(id<FMTokenizerDelegate>)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
Expand Down
10 changes: 5 additions & 5 deletions src/fmdb/FMDatabase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -302,7 +302,7 @@ typedef int(^FMDBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictionary
@warning **Deprecated**: Please use `<executeUpdate:withErrorAndBindings>` instead.
*/

- (BOOL)update:(NSString*)sql withErrorAndBindings:(NSError**)outErr, ... __attribute__ ((deprecated));
- (BOOL)update:(NSString*)sql withErrorAndBindings:(NSError *__autoreleasing *)outErr, ... __attribute__ ((deprecated));

/** Execute single update statement

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down
14 changes: 7 additions & 7 deletions src/fmdb/FMDatabase.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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);

Expand Down Expand Up @@ -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);

Expand All @@ -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);

Expand All @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/fmdb/FMDatabaseAdditions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@

*/

- (BOOL)validateSQL:(NSString*)sql error:(NSError**)error;
- (BOOL)validateSQL:(NSString*)sql error:(NSError *__autoreleasing *)error;


///-----------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/fmdb/FMDatabaseAdditions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/fmdb/FMResultSet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
@see hasAnotherRow
*/

- (BOOL)nextWithError:(NSError **)outErr;
- (BOOL)nextWithError:(NSError *__autoreleasing *)outErr;

/** Did the last call to `<next>` succeed in retrieving another row?

Expand Down
2 changes: 1 addition & 1 deletion src/fmdb/FMResultSet.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);

Expand Down