summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Switzer <dswitzer@xevo.com>2017-05-16 14:45:49 -0700
committerDavid Switzer <dswitzer@xevo.com>2017-05-16 14:45:49 -0700
commitd0b6cdf653038a9ac1c2edfc0fa0b8cdf02cf82d (patch)
tree504314389e538707a92ca1a57875228fbcadf871
parent8f699391cf02b0316851b41c182345e17e7fb36f (diff)
downloadsdl_ios-d0b6cdf653038a9ac1c2edfc0fa0b8cdf02cf82d.tar.gz
Fix minor review feedback issues.
-rw-r--r--SmartDeviceLink/SDLIAPSession.m2
-rw-r--r--SmartDeviceLink/SDLIAPTransport.m4
-rwxr-xr-xSmartDeviceLink/SDLMutableDataQueue.m4
3 files changed, 3 insertions, 7 deletions
diff --git a/SmartDeviceLink/SDLIAPSession.m b/SmartDeviceLink/SDLIAPSession.m
index 5405699df..2048f88de 100644
--- a/SmartDeviceLink/SDLIAPSession.m
+++ b/SmartDeviceLink/SDLIAPSession.m
@@ -212,7 +212,7 @@ NSTimeInterval const streamThreadWaitSecs = 1.0;
// When you disconect the cable you get a stream end event and come here but stream is already in closed state.
// Still need to remove from run loop.
- NSAssert((self.isDataSession && [[NSThread currentThread] isEqual:self.ioStreamThread]) || [NSThread isMainThread], @"startStream is being called on the wrong thread!!!");
+ NSAssert((self.isDataSession && [[NSThread currentThread] isEqual:self.ioStreamThread]) || [NSThread isMainThread], @"stopStream is being called on the wrong thread!!!");
NSUInteger status1 = stream.streamStatus;
if (status1 != NSStreamStatusNotOpen &&
diff --git a/SmartDeviceLink/SDLIAPTransport.m b/SmartDeviceLink/SDLIAPTransport.m
index a653caff1..651df5fbb 100644
--- a/SmartDeviceLink/SDLIAPTransport.m
+++ b/SmartDeviceLink/SDLIAPTransport.m
@@ -172,9 +172,7 @@ int const streamOpenTimeoutSeconds = 2;
// We should be attempting to connect
self.retryCounter++;
EAAccessory *sdlAccessory = accessory;
- // If we are being called from sdl_connectAccessory, the EAAccessoryDidConnectNotification
- // will contain the SDL accessory to connect to and we can connect without searching the
- // accessory manager's connected accessory list. Otherwise, we fall through to a search.
+ // If we are being called from sdl_connectAccessory, the EAAccessoryDidConnectNotification will contain the SDL accessory to connect to and we can connect without searching the accessory manager's connected accessory list. Otherwise, we fall through to a search.
if (sdlAccessory != nil && [self sdl_connectAccessory:sdlAccessory]){
// Connection underway, exit
return;
diff --git a/SmartDeviceLink/SDLMutableDataQueue.m b/SmartDeviceLink/SDLMutableDataQueue.m
index 7bc062893..c91b25d85 100755
--- a/SmartDeviceLink/SDLMutableDataQueue.m
+++ b/SmartDeviceLink/SDLMutableDataQueue.m
@@ -31,9 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
}
- (void)enqueueBuffer:(NSMutableData *)data {
- // Since this method is being called from the main thread and the dequeue methods
- // are being called from the data session stream thread, we need to put critical
- // sections around the queue members. Use the @synchronized object level lock to do this.
+ // Since this method is being called from the main thread and the dequeue methods are being called from the data session stream thread, we need to put critical sections around the queue members. Use the @synchronized object level lock to do this.
@synchronized (self) {
[self.elements addObject:data];
self.frontDequeued = NO;