Fixed a log warning and about 100 other warnings found with -Weverything (GH-#719, #720).

Author: E-B-Smith

Branch-SDK/Branch-SDK/BNCDebug.m

@@ -14,8 +14,8 @@
 
 
 #import "BNCDebug.h"
-#import <sys/sysctl.h>
-#import <objc/runtime.h>
+@import Darwin.sys.sysctl;
+@import ObjectiveC.runtime;
 
 
 BOOL BNCDebuggerIsAttached() {
@@ -60,7 +60,7 @@ BOOL BNCDebuggerIsAttached() {
 
     if (!instance) return @"Object is nil.\n";
 
-    const char* superclassname = "nil";
+    const char* superclassname = "<nil>";
     Class class = object_getClass(instance);
     Class superclass = class_getSuperclass(class);
     if (superclass) superclassname = class_getName(superclass);
@@ -69,11 +69,11 @@ BOOL BNCDebuggerIsAttached() {
     NSMutableString *result = [NSMutableString stringWithCapacity:512];
     if (class_isMetaClass(class)) {
         [result appendFormat:@"\nClass %p is class '%s' of class '%s':\n",
-            instance, class_getName(class), superclassname];
+            (void*)instance, class_getName(class), superclassname];
         class = instance;
     } else {
         [result appendFormat:@"\nInstance %p is of class '%s' of class '%s':\n",
-            instance, class_getName(class), superclassname];
+            (void*)instance, class_getName(class), superclassname];
     }
 
     //  Ivars --
@@ -94,7 +94,7 @@ BOOL BNCDebuggerIsAttached() {
 
     uint count = 0;
     Ivar *ivars = class_copyIvarList(class, &count);
-    for (int i = 0; i < count; ++i) {
+    for (uint i = 0; i < count; ++i) {
         const char* encoding = ivar_getTypeEncoding(ivars[i]);
         const char* ivarName = ivar_getName(ivars[i]);
         const void* ivarPtr = nil;

Branch-SDK/Branch-SDK/BNCDeviceInfo.m

@@ -9,7 +9,7 @@
 
 @import Foundation;
 @import UIKit;
-#import <sys/sysctl.h>
+@import Darwin.sys.sysctl;
 #import "BNCDeviceInfo.h"
 #import "BNCPreferenceHelper.h"
 #import "BNCSystemObserver.h"
@@ -229,7 +229,7 @@ + (NSString*) userAgentString {
     }
 
     //  Different case for iOS 7.0:
-    if ([UIDevice currentDevice].systemVersion.floatValue  < 8.0) {
+    if ([UIDevice currentDevice].systemVersion.doubleValue  < 8.0) {
         BNCLogDebugSDK(@"Getting iOS 7 UserAgent.");
         dispatch_sync(dispatch_get_main_queue(), ^ {
             setBrowserUserAgent();

Branch-SDK/Branch-SDK/BNCEncodingUtils.m

@@ -26,7 +26,8 @@ - (NSString*) description {
     return [NSString stringWithFormat:@"<%@, %@>", self.key, self.value];
 }
 
-- (BOOL) isEqual:(BNCKeyValue*)object {
+- (BOOL) isEqual:(id)rawObject {
+    BNCKeyValue *object = rawObject;
     return
         [object isKindOfClass:[BNCKeyValue class]] &&
         [self.key isEqualToString:object.key] &&
@@ -391,8 +392,8 @@ + (NSData *) dataFromHexString:(NSString*)string {
     if (!bytes) goto exit;
 
     int highValue = -1;
-    uint8_t *p = (uint8_t*) [inputData bytes];
-    for (long i = 0; i < inputData.length; ++i) {
+    const uint8_t *p = (const uint8_t*) [inputData bytes];
+    for (NSUInteger i = 0; i < inputData.length; ++i) {
         int value = -1;
         if (*p >= '0' && *p <= '9')
             value = *p - '0';
@@ -425,7 +426,7 @@ + (NSData *) dataFromHexString:(NSString*)string {
 
 exit:
     if (bytes) {
-        BNCLogAssert(b-bytes<=length);
+        BNCLogAssert((size_t)(b-bytes)<=length);
         free(bytes);
     }
     return data;

Branch-SDK/Branch-SDK/BNCLinkCache.m

@@ -18,7 +18,7 @@ @interface BNCLinkCache ()
 @implementation BNCLinkCache
 
 - (id)init {
-    if (self = [super init]) {
+    if ((self = [super init])) {
         self.cache = [[NSMutableDictionary alloc] init];
     }
     return self;

Branch-SDK/Branch-SDK/BNCLinkData.m

@@ -29,7 +29,7 @@ @interface BNCLinkData ()
 @implementation BNCLinkData
 
 - (id)init {
-    if (self = [super init]) {
+    if ((self = [super init])) {
         self.data = [[NSMutableDictionary alloc] init];
         self.data[@"source"] = @"ios";
     }
@@ -169,7 +169,7 @@ - (void)encodeWithCoder:(NSCoder *)coder {
 }
 
 - (id)initWithCoder:(NSCoder *)coder {
-    if (self = [super init]) {
+    if ((self = [super init])) {
         self.tags = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_TAGS];
         self.alias = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_ALIAS];
         self.type = [[coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_LINK_TYPE] integerValue];

Branch-SDK/Branch-SDK/BNCLocalization.h

@@ -15,8 +15,8 @@
 + (NSDictionary<NSString*, NSDictionary*>*) languageDictionaries;
 - (NSString*) localizeString:(NSString*)string;
 
-@property (copy) NSString* currentLanguage;
-@property (strong, readonly) NSDictionary *currentLanguageDictionary;
+@property (copy, atomic) NSString* currentLanguage;
+@property (strong, atomic, readonly) NSDictionary *currentLanguageDictionary;
 @end
 
 #pragma mark Convenience Functions

Branch-SDK/Branch-SDK/BNCLog.h

@@ -59,7 +59,7 @@ extern void BNCLogSetDisplayLevel(BNCLogLevel level);
 * @param level The log level to convert to a string.
 * @return Returns the string indicating the log level.
 */
-extern NSString *_Nonnull const BNCLogStringFromLogLevel(BNCLogLevel level);
+extern NSString *_Nonnull BNCLogStringFromLogLevel(BNCLogLevel level);
 
 /*!
 * @param string A string indicating the log level.
@@ -91,7 +91,7 @@ extern BNCLogClientInitializeFunctionPtr _Null_unspecified
 #pragma mark - Optional Log Output Handlers
 
 
-///@info Pre-defined log message handlers --
+///@brief Pre-defined log message handlers --
 
 typedef void (*BNCLogOutputFunctionPtr)(NSDate*_Nonnull timestamp, BNCLogLevel level, NSString*_Nullable message);
 

Branch-SDK/Branch-SDK/BNCLog.m

@@ -14,6 +14,7 @@
 
 
 #import  "BNCLog.h"
+@import Darwin.C.stdatomic;
 
 
 #define _countof(array)  (sizeof(array)/sizeof(array[0]))
@@ -490,7 +491,7 @@ void BNCLogSetDisplayLevel(BNCLogLevel level) {
     });
 }
 
-NSString*const bnc_logLevelStrings[] = {
+static NSString*const bnc_logLevelStrings[] = {
     @"BNCLogLevelAll",
     @"BNCLogLevelBreakPoint",
     @"BNCLogLevelDebug",
@@ -502,14 +503,14 @@ void BNCLogSetDisplayLevel(BNCLogLevel level) {
     @"BNCLogLevelMax"
 };
 
-NSString*const BNCLogStringFromLogLevel(BNCLogLevel level) {
+NSString* BNCLogStringFromLogLevel(BNCLogLevel level) {
     level = MAX(MIN(level, BNCLogLevelMax), 0);
     return bnc_logLevelStrings[level];
 }
 
 BNCLogLevel BNCLogLevelFromString(NSString*string) {
     if (!string) return BNCLogLevelNone;
-    for (NSInteger i = 0; i < _countof(bnc_logLevelStrings); ++i) {
+    for (NSUInteger i = 0; i < _countof(bnc_logLevelStrings); ++i) {
         if ([bnc_logLevelStrings[i] isEqualToString:string]) {
             return i;
         }
@@ -522,7 +523,6 @@ BNCLogLevel BNCLogLevelFromString(NSString*string) {
 
 #pragma mark - Client Initialization Function
 
-#include "stdatomic.h"
 static _Atomic(BNCLogClientInitializeFunctionPtr) bnc_LogClientInitializeFunctionPtr = (BNCLogClientInitializeFunctionPtr) 0;
 
 extern BNCLogClientInitializeFunctionPtr _Null_unspecified BNCLogSetClientInitializeFunction(

Branch-SDK/Branch-SDK/BNCPreferenceHelper.h

@@ -41,7 +41,7 @@ NSURL* /* _Nonnull */ BNCURLForBranchDirectory(void);
 @property (strong, nonatomic) NSDictionary *appleSearchAdDetails;
 @property (strong, nonatomic) NSString *lastSystemBuildVersion;
 @property (strong, nonatomic) NSString *browserUserAgentString;
-@property (strong) NSString *branchAPIURL;
+@property (strong, atomic) NSString *branchAPIURL;
 
 + (BNCPreferenceHelper *)preferenceHelper;
 

Branch-SDK/Branch-SDK/BNCPreferenceHelper.m

@@ -99,7 +99,7 @@ + (BNCPreferenceHelper *)preferenceHelper {
 }
 
 - (id)init {
-    if (self = [super init]) {
+    if ((self = [super init])) {
         _timeout = DEFAULT_TIMEOUT;
         _retryCount = DEFAULT_RETRY_COUNT;
         _retryInterval = DEFAULT_RETRY_INTERVAL;
@@ -150,8 +150,10 @@ - (NSOperationQueue *)persistPrefsQueue {
 }
 
 - (void) synchronize {
-    //  Flushes preference queue to persistence.
-    [_persistPrefsQueue waitUntilAllOperationsAreFinished];
+    @synchronized(self) {
+        //  Flushes preference queue to persistence.
+        [_persistPrefsQueue waitUntilAllOperationsAreFinished];
+    }
 }
 
 - (void) dealloc {
@@ -530,7 +532,7 @@ - (void)addInstrumentationDictionaryKey:(NSString *)key value:(NSString *)value
 - (void)clearInstrumentationDictionary {
     @synchronized (self) {
         NSArray *keys = [_instrumentationDictionary allKeys];
-        for (int i = 0 ; i < [keys count]; i++) {
+        for (NSUInteger i = 0 ; i < [keys count]; i++) {
             [_instrumentationDictionary removeObjectForKey:keys[i]];
         }
     }
@@ -707,7 +709,7 @@ - (NSMutableDictionary *)persistenceDict {
             if (!error && data)
                 persistenceDict = [NSKeyedUnarchiver unarchiveObjectWithData:data];
         }
-        @catch (NSException *exception) {
+        @catch (NSException*) {
             BNCLogWarning(@"Failed to load preferences from storage.");
         }