Merge pull request #166 from ably/fix-warnings

Fix compiler warnings.
ably · Jan 26, 2016 · b4b8b04 · b4b8b04
2 parents 2b3bcaf + 4a292ae
commit b4b8b04
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 16 deletions.
diff --git a/ably-ios/ARTChannel.h b/ably-ios/ARTChannel.h
@@ -32,7 +32,7 @@ ART_ASSUME_NONNULL_BEGIN
 - (void)publishMessage:(ARTMessage *)message callback:(art_nullable ARTErrorCallback)callback;
 - (void)publishMessages:(__GENERIC(NSArray, ARTMessage *) *)messages callback:(art_nullable ARTErrorCallback)callback;
 
-- (BOOL)history:(art_nullable ARTDataQuery *)query callback:(void(^)(__GENERIC(ARTPaginatedResult, ARTMessage *)  *__art_nullable result, NSError *__art_nullable error))callback error:(NSError *__art_nullable *__art_nullable)errorPtr;
+- (BOOL)history:(art_nullable ARTDataQuery *)query callback:(void(^)(__GENERIC(ARTPaginatedResult, ARTMessage *) *__art_nullable result, NSError *__art_nullable error))callback error:(NSError *__art_nullable *__art_nullable)errorPtr;
 
 @end
 

diff --git a/ably-ios/ARTLog.m b/ably-ios/ARTLog.m
@@ -85,7 +85,7 @@ - (void)debug:(NSString *)format, ... {
 - (void)debug:(const char *)fileName line:(NSUInteger)line message:(NSString *)message, ... {
     va_list args;
     va_start(args, message);
-    [self log:[[NSString alloc] initWithFormat:[NSString stringWithFormat:@"(%@:%d) %@", [[NSString stringWithUTF8String:fileName] lastPathComponent], line, message] arguments:args] level:ARTLogLevelDebug];
+    [self log:[[NSString alloc] initWithFormat:[NSString stringWithFormat:@"(%@:%lu) %@", [[NSString stringWithUTF8String:fileName] lastPathComponent], (unsigned long)line, message] arguments:args] level:ARTLogLevelDebug];
     va_end(args);
 }
 

diff --git a/ably-ios/ARTPresenceMessage.m b/ably-ios/ARTPresenceMessage.m
@@ -29,7 +29,7 @@ - (NSString *)description {
     NSMutableString *description = [[super description] mutableCopy];
     [description deleteCharactersInRange:NSMakeRange(description.length - (description.length>2 ? 2:0), 2)];
     [description appendFormat:@",\n"];
-    [description appendFormat:@" action: %d\n", self.action];
+    [description appendFormat:@" action: %lu\n", (unsigned long)self.action];
     [description appendFormat:@"}"];
     return description;
 }

diff --git a/ably-ios/ARTProtocolMessage.m b/ably-ios/ARTProtocolMessage.m
@@ -46,7 +46,7 @@ - (NSString *)description {
     NSMutableString *description = [NSMutableString stringWithFormat:@"<%@: %p> {\n", self.class, self];
     [description appendFormat:@" count: %d,\n", self.count];
     [description appendFormat:@" id: %@,\n", self.id];
-    [description appendFormat:@" action: %d,\n", self.action];
+    [description appendFormat:@" action: %lu,\n", (unsigned long)self.action];
     [description appendFormat:@" clientId: %@,\n", self.clientId];
     [description appendFormat:@" channel: %@,\n", self.channel];
     [description appendFormat:@" channelSerial: %@,\n", self.channelSerial];

diff --git a/ably-ios/ARTRealtime.m b/ably-ios/ARTRealtime.m
@@ -690,7 +690,7 @@ - (void)ack:(ARTProtocolMessage *)message {
     NSArray *nackMessages = nil;
     NSArray *ackMessages = nil;
     [self.logger verbose:@"ARTRealtime ACK: msgSerial=%lld, count=%d", serial, count];
-    [self.logger verbose:@"ARTRealtime ACK (before processing): pendingMessageStartSerial=%lld, pendingMessages=%d", self.pendingMessageStartSerial, self.pendingMessages.count];
+    [self.logger verbose:@"ARTRealtime ACK (before processing): pendingMessageStartSerial=%lld, pendingMessages=%lu", self.pendingMessageStartSerial, (unsigned long)self.pendingMessages.count];
 
     if (serial < self.pendingMessageStartSerial) {
         // This is an error condition and shouldn't happen but
@@ -733,14 +733,14 @@ - (void)ack:(ARTProtocolMessage *)message {
         msg.cb([ARTStatus state:ARTStateOk]);
     }
 
-    [self.logger verbose:@"ARTRealtime ACK (after processing): pendingMessageStartSerial=%lld, pendingMessages=%d", self.pendingMessageStartSerial, self.pendingMessages.count];
+    [self.logger verbose:@"ARTRealtime ACK (after processing): pendingMessageStartSerial=%lld, pendingMessages=%lu", self.pendingMessageStartSerial, (unsigned long)self.pendingMessages.count];
 }
 
 - (void)nack:(ARTProtocolMessage *)message {
     int64_t serial = message.msgSerial;
     int count = message.count;
     [self.logger verbose:@"ARTRealtime NACK: msgSerial=%lld, count=%d", serial, count];
-    [self.logger verbose:@"ARTRealtime NACK (before processing): pendingMessageStartSerial=%lld, pendingMessages=%d", self.pendingMessageStartSerial, self.pendingMessages.count];
+    [self.logger verbose:@"ARTRealtime NACK (before processing): pendingMessageStartSerial=%lld, pendingMessages=%lu", self.pendingMessageStartSerial, (unsigned long)self.pendingMessages.count];
 
     if (serial != self.pendingMessageStartSerial) {
         // This is an error condition and it shouldn't happen but
@@ -768,7 +768,7 @@ - (void)nack:(ARTProtocolMessage *)message {
         msg.cb([ARTStatus state:ARTStateError info:message.error]);
     }
 
-    [self.logger verbose:@"ARTRealtime NACK (after processing): pendingMessageStartSerial=%lld, pendingMessages=%d", self.pendingMessageStartSerial, self.pendingMessages.count];
+    [self.logger verbose:@"ARTRealtime NACK (after processing): pendingMessageStartSerial=%lld, pendingMessages=%lu", self.pendingMessageStartSerial, (unsigned long)self.pendingMessages.count];
 }
 
 - (CFRunLoopTimerRef)startTimer:(void(^)())onTimeout interval:(NSTimeInterval)interval {

diff --git a/ably-ios/ARTRestChannel.m b/ably-ios/ARTRestChannel.m
@@ -51,7 +51,7 @@ - (ARTRestPresence *)presence {
     return _restPresence;
 }
 
-- (BOOL)history:(ARTDataQuery *)query callback:(void(^)(ARTPaginatedResult *result, NSError *error))callback error:(NSError **)errorPtr {
+- (BOOL)history:(ARTDataQuery *)query callback:(void(^)(__GENERIC(ARTPaginatedResult, ARTMessage *) *result, NSError *error))callback error:(NSError **)errorPtr {
     if (query.limit > 1000) {
         if (errorPtr) {
             *errorPtr = [NSError errorWithDomain:ARTAblyErrorDomain

diff --git a/ably-ios/ARTStatus.h b/ably-ios/ARTStatus.h
@@ -42,10 +42,9 @@ FOUNDATION_EXPORT NSString *const ARTAblyErrorDomain;
 @interface ARTErrorInfo : NSObject
 
 @property (readonly, copy, nonatomic) NSString *message;
-@property (readonly, assign, nonatomic) int statusCode;
-@property (readonly, assign, nonatomic) int code;
+@property (readonly, assign, nonatomic) NSInteger statusCode;
+@property (readonly, assign, nonatomic) NSInteger code;
 
-// FIXME: use NSInteger instead int (don't know what kind of processor architecture your code might run)
 - (ARTErrorInfo *)setCode:(NSInteger) code message:(NSString *) message;
 - (ARTErrorInfo *)setCode:(NSInteger) code status:(NSInteger) status message:(NSString *) message;
 

diff --git a/ably-ios/ARTStatus.m b/ably-ios/ARTStatus.m
@@ -46,7 +46,7 @@ + (ARTErrorInfo *)createWithNSError:(NSError *)error {
 }
 
 - (NSString *)description {
-    return [NSString stringWithFormat:@"ARTErrorInfo with code %d, message: %@", self.statusCode, self.message];
+    return [NSString stringWithFormat:@"ARTErrorInfo with code %ld, message: %@", (long)self.statusCode, self.message];
 }
 
 @end
@@ -75,7 +75,7 @@ + (ARTStatus *)state:(ARTState)state info:(ARTErrorInfo *)info {
 }
 
 - (NSString *)description {
-    return [NSString stringWithFormat:@"ARTStatus: %d, Error info: %@", self.state, [self.errorInfo description]];
+    return [NSString stringWithFormat:@"ARTStatus: %lu, Error info: %@", (unsigned long)self.state, [self.errorInfo description]];
 }
 
 

diff --git a/ably-ios/ARTWebSocketTransport.m b/ably-ios/ARTWebSocketTransport.m
@@ -79,7 +79,7 @@ - (void)dealloc {
 }
 
 - (void)send:(ARTProtocolMessage *)msg {
-    [self.logger debug:__FILE__ line:__LINE__ message:@"%p sending action %d with %@", self, msg.action, msg.messages];
+    [self.logger debug:__FILE__ line:__LINE__ message:@"%p sending action %lu with %@", self, (unsigned long)msg.action, msg.messages];
     NSData *data = [self.encoder encodeProtocolMessage:msg];
     [self.websocket sendWithData:data];
 }
@@ -226,7 +226,7 @@ - (void)webSocketOpen {
 
 - (void)webSocketClose:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean {
     ARTWebSocketTransport * __weak weakSelf = self;
-    [self.logger debug:__FILE__ line:__LINE__ message:@"%p websocket did disconnect (code %d) %@", self, code, reason];
+    [self.logger debug:__FILE__ line:__LINE__ message:@"%p websocket did disconnect (code %ld) %@", self, (long)code, reason];
 
     CFRunLoopPerformBlock(self.rl, kCFRunLoopDefaultMode, ^{
         ARTWebSocketTransport *s = weakSelf;