diff options
| -rw-r--r-- | Firebase/Core/FIRApp.m | 4 | ||||
| -rw-r--r-- | Firebase/Core/FIRLogger.m | 3 | ||||
| -rw-r--r-- | Firebase/Core/FIRVersion.m | 7 | ||||
| -rw-r--r-- | Firebase/Storage/FIRStorageErrors.m | 2 | ||||
| -rw-r--r-- | Firebase/Storage/FIRStorageObservableTask.m | 2 |
5 files changed, 7 insertions, 11 deletions
diff --git a/Firebase/Core/FIRApp.m b/Firebase/Core/FIRApp.m index b5e043f..22c9369 100644 --- a/Firebase/Core/FIRApp.m +++ b/Firebase/Core/FIRApp.m @@ -381,9 +381,7 @@ static FIRApp *sDefaultApp; [NSString stringWithFormat:@"Configuration failed for service %@.", service]; NSDictionary *errorDict = @{NSLocalizedDescriptionKey : description, NSLocalizedFailureReasonErrorKey : reason}; - return [NSError errorWithDomain:domain - code:code - userInfo:errorDict]; + return [NSError errorWithDomain:domain code:code userInfo:errorDict]; } + (NSError *)errorForInvalidAppID { diff --git a/Firebase/Core/FIRLogger.m b/Firebase/Core/FIRLogger.m index 69929fd..01231a7 100644 --- a/Firebase/Core/FIRLogger.m +++ b/Firebase/Core/FIRLogger.m @@ -230,7 +230,8 @@ void FIRLogBasic(FIRLoggerLevel level, NSCAssert(numberOfMatches == 1, @"Incorrect message code format."); #endif NSString *logMsg = [[NSString alloc] initWithFormat:message arguments:args_ptr]; - logMsg = [NSString stringWithFormat:@"%s - %@[%@] %@", FirebaseVersionString, service, messageCode, logMsg]; + logMsg = [NSString + stringWithFormat:@"%s - %@[%@] %@", FirebaseVersionString, service, messageCode, logMsg]; dispatch_async(sFIRClientQueue, ^{ asl_log(sFIRLoggerClient, NULL, level, "%s", logMsg.UTF8String); }); diff --git a/Firebase/Core/FIRVersion.m b/Firebase/Core/FIRVersion.m index 8186683..00a6741 100644 --- a/Firebase/Core/FIRVersion.m +++ b/Firebase/Core/FIRVersion.m @@ -14,8 +14,6 @@ * limitations under the License. */ - - #ifndef Firebase_VERSION #error "Firebase_VERSION is not defined: add -DFirebase_VERSION=... to the build invocation" #endif @@ -24,7 +22,6 @@ #error "FIRCore_VERSION is not defined: add -DFIRCore_VERSION=... to the build invocation" #endif - // The following two macros supply the incantation so that the C // preprocessor does not try to parse the version as a floating // point number. See @@ -33,7 +30,7 @@ #define STR_EXPAND(x) #x const unsigned char *const FirebaseVersionString = - (const unsigned char *const)STR(Firebase_VERSION); + (const unsigned char *const)STR(Firebase_VERSION); const unsigned char *const FirebaseCoreVersionString = - (const unsigned char *const)STR(FIRCore_VERSION); + (const unsigned char *const)STR(FIRCore_VERSION); diff --git a/Firebase/Storage/FIRStorageErrors.m b/Firebase/Storage/FIRStorageErrors.m index 92c0536..dd5c903 100644 --- a/Firebase/Storage/FIRStorageErrors.m +++ b/Firebase/Storage/FIRStorageErrors.m @@ -104,7 +104,7 @@ break; case FIRStorageErrorCodeUnknown: - /* Fall through to default case for unknown errors */ + /* Fall through to default case for unknown errors */ default: errorMessage = @"An unknown error occurred, please check the server response."; diff --git a/Firebase/Storage/FIRStorageObservableTask.m b/Firebase/Storage/FIRStorageObservableTask.m index 58455f6..7d7c61f 100644 --- a/Firebase/Storage/FIRStorageObservableTask.m +++ b/Firebase/Storage/FIRStorageObservableTask.m @@ -102,7 +102,7 @@ break; case FIRStorageTaskStatusUnknown: - // Fall through to exception case if an unknown status is passed + // Fall through to exception case if an unknown status is passed default: [NSException raise:NSInternalInconsistencyException |