From a006862a61044078f6faca72dbf9a243505725c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Spie=C3=9F?= Date: Sat, 12 Sep 2015 00:52:53 +0200 Subject: [PATCH] Fix several small type comparison issues --- Classes/BITChannel.h | 2 +- Classes/BITChannel.m | 2 +- Classes/BITCrashReportTextFormatter.m | 4 ++-- Classes/BITFeedbackListViewCell.m | 2 +- Classes/BITFeedbackListViewController.m | 2 +- Classes/BITImageAnnotationViewController.m | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Classes/BITChannel.h b/Classes/BITChannel.h index 3679dc52b5..815c7da158 100644 --- a/Classes/BITChannel.h +++ b/Classes/BITChannel.h @@ -61,7 +61,7 @@ FOUNDATION_EXPORT char *BITSafeJsonEventsString; /** * Number of queue items which will trigger a flush (testing). */ -@property (nonatomic) NSInteger maxBatchCount; +@property (nonatomic) NSUInteger maxBatchCount; /** * A queue which makes array operations thread safe. diff --git a/Classes/BITChannel.m b/Classes/BITChannel.m index 76686fa0ac..75859f36c6 100644 --- a/Classes/BITChannel.m +++ b/Classes/BITChannel.m @@ -182,7 +182,7 @@ void bit_resetSafeJsonStream(char **string) { #pragma mark - Batching -- (NSInteger)maxBatchCount { +- (NSUInteger)maxBatchCount { if(_maxBatchCount <= 0){ return defaultMaxBatchCount; } diff --git a/Classes/BITCrashReportTextFormatter.m b/Classes/BITCrashReportTextFormatter.m index 895f1c012c..bfbd0e6449 100644 --- a/Classes/BITCrashReportTextFormatter.m +++ b/Classes/BITCrashReportTextFormatter.m @@ -581,7 +581,7 @@ static const char *findSEL (const char *imageName, NSString *imageUUID, uint64_t #endif [text appendFormat: fmt, imageInfo.imageBaseAddress, - imageInfo.imageBaseAddress + (MAX(1, imageInfo.imageSize) - 1), // The Apple format uses an inclusive range + imageInfo.imageBaseAddress + (MAX(1U, imageInfo.imageSize) - 1), // The Apple format uses an inclusive range binaryDesignator, [imageInfo.imageName lastPathComponent], archName, @@ -809,7 +809,7 @@ static const char *findSEL (const char *imageName, NSString *imageUUID, uint64_t /* Make sure UTF8/16 characters are handled correctly */ NSInteger offset = 0; - NSInteger index = 0; + NSUInteger index = 0; for (index = 0; index < [imageName length]; index++) { NSRange range = [imageName rangeOfComposedCharacterSequenceAtIndex:index]; if (range.length > 1) { diff --git a/Classes/BITFeedbackListViewCell.m b/Classes/BITFeedbackListViewCell.m index 5e6867a373..5f95480ec1 100644 --- a/Classes/BITFeedbackListViewCell.m +++ b/Classes/BITFeedbackListViewCell.m @@ -359,7 +359,7 @@ - (void)imageButtonPressed:(id)sender { if ([self.delegate respondsToSelector:@selector(listCell:didSelectAttachment:)]) { - NSInteger index = [self.attachmentViews indexOfObject:sender]; + NSUInteger index = [self.attachmentViews indexOfObject:sender]; if (index != NSNotFound && [self.message previewableAttachments].count > index) { BITFeedbackMessageAttachment *attachment = [self.message previewableAttachments][index]; [self.delegate listCell:self didSelectAttachment:attachment]; diff --git a/Classes/BITFeedbackListViewController.m b/Classes/BITFeedbackListViewController.m index cf80e907ed..373a2fbc71 100644 --- a/Classes/BITFeedbackListViewController.m +++ b/Classes/BITFeedbackListViewController.m @@ -956,7 +956,7 @@ self.cachedPreviewItems = nil; NSMutableArray *collectedAttachments = [NSMutableArray new]; - for (int i = 0; i < self.manager.numberOfMessages; i++) { + for (uint i = 0; i < self.manager.numberOfMessages; i++) { BITFeedbackMessage *message = [self.manager messageAtIndex:i]; [collectedAttachments addObjectsFromArray:message.previewableAttachments]; } diff --git a/Classes/BITImageAnnotationViewController.m b/Classes/BITImageAnnotationViewController.m index 81ce400231..8d6cfef3b5 100644 --- a/Classes/BITImageAnnotationViewController.m +++ b/Classes/BITImageAnnotationViewController.m @@ -301,7 +301,7 @@ typedef NS_ENUM(NSInteger, BITImageAnnotationViewControllerInteractionMode) { BITImageAnnotation *candidate = nil; BOOL validView = YES; - for ( int i = 0; i