chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Replace unsigned with int in SecondsFormatter.

Browse source
This commit is contained in:
Jan Weiß 2021-05-05 15:17:37 +02:00
parent 64fbc7115c
commit 82098b044c
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Formatters/SecondsFormatter.m
View file

@ -34,15 +34,12 @@
if (isnan(floatValue)) { return @"NaN"; } if (isnan(floatValue)) { return @"NaN"; }
if (isinf(floatValue)) { return @"Inf"; } if (isinf(floatValue)) { return @"Inf"; }
unsigned totalSeconds = (unsigned)floatValue; int totalSeconds = (int)floatValue;
unsigned seconds = totalSeconds % 60; int seconds = totalSeconds % 60;
unsigned minutes = totalSeconds / 60; int minutes = totalSeconds / 60;
unsigned hours = 0; int hours = 0;
unsigned days = 0; int days = 0;
seconds = totalSeconds % 60;
minutes = totalSeconds / 60;
while(60 <= minutes) { while(60 <= minutes) {
minutes -= 60; minutes -= 60;
@ -57,16 +54,16 @@
NSString *result = nil; NSString *result = nil;
if(0 < days) { if(0 < days) {
result = [NSString stringWithFormat:@"%u:%.2u:%.2u:%.2u", days, hours, minutes, seconds]; result = [NSString stringWithFormat:@"%i:%.2i:%.2i:%.2i", days, hours, minutes, seconds];
} }
else if(0 < hours) { else if(0 < hours) {
result = [NSString stringWithFormat:@"%u:%.2u:%.2u", hours, minutes, seconds]; result = [NSString stringWithFormat:@"%i:%.2i:%.2i", hours, minutes, seconds];
} }
else if(0 < minutes) { else if(0 < minutes) {
result = [NSString stringWithFormat:@"%u:%.2u", minutes, seconds]; result = [NSString stringWithFormat:@"%i:%.2i", minutes, seconds];
} }
else { else {
result = [NSString stringWithFormat:@"0:%.2u", seconds]; result = [NSString stringWithFormat:@"0:%.2i", seconds];
} }
return result; return result;
@ -77,7 +74,7 @@
NSScanner *scanner = nil; NSScanner *scanner = nil;
BOOL result = NO; BOOL result = NO;
int value = 0; int value = 0;
unsigned seconds = 0; int seconds = 0;
scanner = [NSScanner scannerWithString:string]; scanner = [NSScanner scannerWithString:string];
@ -95,7 +92,7 @@
} }
if(result && NULL != object) { if(result && NULL != object) {
*object = [NSNumber numberWithUnsignedInt:seconds]; *object = [NSNumber numberWithInt:seconds];
} }
else if(NULL != error) { else if(NULL != error) {
*error = @"Couldn't convert value to seconds"; *error = @"Couldn't convert value to seconds";