Change errorCode from long to int

This commit is contained in:
Cameron Gutman
2020-02-25 00:00:00 -08:00
parent 65578b8a64
commit 742bb7b516
4 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -12,10 +12,10 @@
@protocol ConnectionCallbacks <NSObject> @protocol ConnectionCallbacks <NSObject>
- (void) connectionStarted; - (void) connectionStarted;
- (void) connectionTerminated:(long)errorCode; - (void) connectionTerminated:(int)errorCode;
- (void) stageStarting:(const char*)stageName; - (void) stageStarting:(const char*)stageName;
- (void) stageComplete:(const char*)stageName; - (void) stageComplete:(const char*)stageName;
- (void) stageFailed:(const char*)stageName withError:(long)errorCode; - (void) stageFailed:(const char*)stageName withError:(int)errorCode;
- (void) launchFailed:(NSString*)message; - (void) launchFailed:(NSString*)message;
- (void) rumble:(unsigned short)controllerNumber lowFreqMotor:(unsigned short)lowFreqMotor highFreqMotor:(unsigned short)highFreqMotor; - (void) rumble:(unsigned short)controllerNumber lowFreqMotor:(unsigned short)lowFreqMotor highFreqMotor:(unsigned short)highFreqMotor;
- (void) connectionStatusUpdate:(int)status; - (void) connectionStatusUpdate:(int)status;
+2 -2
View File
@@ -251,7 +251,7 @@ void ClStageComplete(int stage)
[_callbacks stageComplete:LiGetStageName(stage)]; [_callbacks stageComplete:LiGetStageName(stage)];
} }
void ClStageFailed(int stage, long errorCode) void ClStageFailed(int stage, int errorCode)
{ {
[_callbacks stageFailed:LiGetStageName(stage) withError:errorCode]; [_callbacks stageFailed:LiGetStageName(stage) withError:errorCode];
} }
@@ -261,7 +261,7 @@ void ClConnectionStarted(void)
[_callbacks connectionStarted]; [_callbacks connectionStarted];
} }
void ClConnectionTerminated(long errorCode) void ClConnectionTerminated(int errorCode)
{ {
[_callbacks connectionTerminated: errorCode]; [_callbacks connectionTerminated: errorCode];
} }
@@ -230,8 +230,8 @@
}); });
} }
- (void)connectionTerminated:(long)errorCode { - (void)connectionTerminated:(int)errorCode {
Log(LOG_I, @"Connection terminated: %ld", errorCode); Log(LOG_I, @"Connection terminated: %d", errorCode);
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
// Allow the display to go to sleep now // Allow the display to go to sleep now
@@ -264,15 +264,15 @@
- (void) stageComplete:(const char*)stageName { - (void) stageComplete:(const char*)stageName {
} }
- (void) stageFailed:(const char*)stageName withError:(long)errorCode { - (void) stageFailed:(const char*)stageName withError:(int)errorCode {
Log(LOG_I, @"Stage %s failed: %ld", stageName, errorCode); Log(LOG_I, @"Stage %s failed: %d", stageName, errorCode);
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
// Allow the display to go to sleep now // Allow the display to go to sleep now
[UIApplication sharedApplication].idleTimerDisabled = NO; [UIApplication sharedApplication].idleTimerDisabled = NO;
UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"Connection Failed" UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"Connection Failed"
message:[NSString stringWithFormat:@"%s failed with error %ld", message:[NSString stringWithFormat:@"%s failed with error %d",
stageName, errorCode] stageName, errorCode]
preferredStyle:UIAlertControllerStyleAlert]; preferredStyle:UIAlertControllerStyleAlert];
[Utils addHelpOptionToDialog:alert]; [Utils addHelpOptionToDialog:alert];