diff --git a/SocketRocket/SRWebSocket.m b/SocketRocket/SRWebSocket.m index ef7c65c5f..6ca44531a 100644 --- a/SocketRocket/SRWebSocket.m +++ b/SocketRocket/SRWebSocket.m @@ -33,6 +33,7 @@ #import #import + #import "base64.h" #import "NSData+SRB64Additions.h" @@ -1295,7 +1296,6 @@ - (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode; } } - // SRFastLog(@"%@ Got stream event %d", aStream, eventCode); dispatch_async(_workQueue, ^{ switch (eventCode) { case NSStreamEventOpenCompleted: { @@ -1303,7 +1303,6 @@ - (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode; if (self.readyState >= SR_CLOSING) { return; } - assert(_readBuffer); @@ -1383,7 +1382,6 @@ - (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode; break; } }); - } @end @@ -1459,7 +1457,6 @@ - (NSString *)SR_origin; @end static inline dispatch_queue_t log_queue() { - static dispatch_queue_t queue = 0; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ @@ -1488,13 +1485,11 @@ static inline void SRFastLog(NSString *format, ...) { #ifdef HAS_ICU static inline int32_t validate_dispatch_data_partial_string(NSData *data) { - const void * contents = [data bytes]; long size = [data length]; const uint8_t *str = (const uint8_t *)contents; - UChar32 codepoint = 1; int32_t offset = 0; int32_t lastOffset = 0; @@ -1513,7 +1508,6 @@ static inline int32_t validate_dispatch_data_partial_string(NSData *data) { U8_MASK_LEAD_BYTE(leadByte, U8_COUNT_TRAIL_BYTES(leadByte)); for (int i = lastOffset + 1; i < offset; i++) { - if (U8_IS_SINGLE(str[i]) || U8_IS_LEAD(str[i]) || !U8_IS_TRAIL(str[i])) { size = -1; }