Skip to content

Commit 5c10ac3

Browse files
Update _variadicArgumentsToArray:args: method
Update method to have better pre-ARC memory management syntax (I think).
1 parent 908ba9d commit 5c10ac3

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Source/OCMock/OCMockObject.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -451,25 +451,25 @@ - (NSString *)_stubDescriptions:(BOOL)onlyExpectations
451451
return outputString;
452452
}
453453

454-
+ (NSArray *)_variadicArgumentsToArray:(id)firstObject args:(va_list)args
454+
+ (NSArray *)_variadicArgumentsToArray:(id)firstObject args:(va_list *)args
455455
{
456456
NSMutableArray *variadicObjects = nil;
457457

458458
if(firstObject)
459459
{
460-
variadicObjects = [[NSMutableArray alloc] init];
460+
variadicObjects = [[[NSMutableArray alloc] init] autorelease];
461461
[variadicObjects addObject:firstObject];
462462

463-
if(args != nil)
463+
if(args)
464464
{
465465
id eachObject;
466-
while ((eachObject = va_arg(args, id)) && eachObject != nil) {
466+
while ((eachObject = va_arg(*args, typeof(firstObject)))) {
467467
[variadicObjects addObject:eachObject];
468468
}
469469
}
470470
}
471471

472-
return [variadicObjects copy];
472+
return variadicObjects;
473473
}
474474

475475
@end

0 commit comments

Comments
 (0)