Browse Source

Merge pull request #460 from facebook/nlutsenko.warning

Fix warnings on few potential clang configurations.
Nikita Lutsenko 9 years ago
parent
commit
47971ebe5e

+ 0 - 1
SocketRocket/Internal/Proxy/SRProxyConnect.m

@@ -361,7 +361,6 @@
         } break;
         case NSStreamEventHasSpaceAvailable:
         case NSStreamEventNone:
-        default:
             SRDebugLog(@"(default)  %@", aStream);
             break;
     }

+ 8 - 6
SocketRocket/Internal/Utilities/SRHTTPConnectMessage.m

@@ -42,12 +42,14 @@ CFHTTPMessageRef SRHTTPConnectMessageCreate(NSURLRequest *request,
     }
 
     // Apply cookies if any have been provided
-    NSDictionary<NSString *, NSString *> *messageCookies = [NSHTTPCookie requestHeaderFieldsWithCookies:cookies];
-    [messageCookies enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, NSString * _Nonnull obj, BOOL * _Nonnull stop) {
-        if (key.length && obj.length) {
-            CFHTTPMessageSetHeaderFieldValue(message, (__bridge CFStringRef)key, (__bridge CFStringRef)obj);
-        }
-    }];
+    if (cookies) {
+        NSDictionary<NSString *, NSString *> *messageCookies = [NSHTTPCookie requestHeaderFieldsWithCookies:cookies];
+        [messageCookies enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, NSString * _Nonnull obj, BOOL * _Nonnull stop) {
+            if (key.length && obj.length) {
+                CFHTTPMessageSetHeaderFieldValue(message, (__bridge CFStringRef)key, (__bridge CFStringRef)obj);
+            }
+        }];
+    }
 
     // set header for http basic auth
     NSString *basicAuthorizationString = SRBasicAuthorizationHeaderFromURL(url);

+ 0 - 1
SocketRocket/SRWebSocket.m

@@ -1502,7 +1502,6 @@ static const size_t SRFrameHeaderOverhead = 32;
         }
 
         case NSStreamEventNone:
-        default:
             SRDebugLog(@"(default)  %@", aStream);
             break;
     }