@@ -30,6 +30,8 @@ static BOOL OCMObjectIsClass(id object) {
30
30
#define object_isClass OCMObjectIsClass
31
31
#endif
32
32
33
+ static NSString *const OCMArgAnyPointerDescription = @" <[OCMArg anyPointer]>" ;
34
+
33
35
34
36
@implementation NSInvocation (OCMAdditions)
35
37
@@ -331,6 +333,7 @@ - (id)getArgumentAtIndexAsObject:(NSInteger)argIndex
331
333
return nil ;
332
334
}
333
335
336
+
334
337
- (NSString *)invocationDescription
335
338
{
336
339
NSMethodSignature *methodSignature = [self methodSignature ];
@@ -351,11 +354,6 @@ - (NSString *)invocationDescription
351
354
return [description autorelease ];
352
355
}
353
356
354
- - (NSString *)anyPointerDescription
355
- {
356
- return @" <Any Pointer>" ;
357
- }
358
-
359
357
- (NSString *)argumentDescriptionAtIndex : (NSInteger )argIndex
360
358
{
361
359
const char *argType = OCMTypeWithoutQualifiers ([[self methodSignature ] getArgumentTypeAtIndex: (NSUInteger )argIndex]);
@@ -386,7 +384,6 @@ - (NSString *)argumentDescriptionAtIndex:(NSInteger)argIndex
386
384
387
385
}
388
386
389
-
390
387
- (NSString *)objectDescriptionAtIndex : (NSInteger )anInt
391
388
{
392
389
id object;
@@ -529,24 +526,22 @@ - (NSString *)pointerDescriptionAtIndex:(NSInteger)anInt
529
526
void *buffer;
530
527
531
528
[self getArgument: &buffer atIndex: anInt];
532
- if (buffer == [OCMArg anyPointer ])
533
- {
534
- return [self anyPointerDescription ];
535
- }
536
- else
537
- {
538
- return [NSString stringWithFormat: @" %p " , buffer];
539
- }
529
+
530
+ if (buffer == [OCMArg anyPointer ])
531
+ return OCMArgAnyPointerDescription;
532
+ else
533
+ return [NSString stringWithFormat: @" %p " , buffer];
540
534
}
541
535
542
536
- (NSString *)cStringDescriptionAtIndex : (NSInteger )anInt
543
537
{
544
538
char *cStringPtr;
545
539
546
540
[self getArgument: &cStringPtr atIndex: anInt];
541
+
547
542
if (cStringPtr == [OCMArg anyPointer ])
548
543
{
549
- return [ self anyPointerDescription ] ;
544
+ return OCMArgAnyPointerDescription ;
550
545
}
551
546
else
552
547
{
0 commit comments