Skip to content

Commit ecb4006

Browse files
erikdoeerikdoe
committed
Merge pull request flutter#133 from madsolar8582/fixintegerprimitives
Use NSInteger instead of int for 32/64 bit safety
2 parents 0adc653 + d5f1467 commit ecb4006

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎Source/OCMock/NSInvocation+OCMAdditions.h

+20-20
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,28 @@
2020

2121
- (BOOL)hasCharPointerArgument;
2222

23-
- (id)getArgumentAtIndexAsObject:(int)argIndex;
23+
- (id)getArgumentAtIndexAsObject:(NSInteger)argIndex;
2424

2525
- (NSString *)invocationDescription;
2626

27-
- (NSString *)argumentDescriptionAtIndex:(int)argIndex;
28-
29-
- (NSString *)objectDescriptionAtIndex:(int)anInt;
30-
- (NSString *)charDescriptionAtIndex:(int)anInt;
31-
- (NSString *)unsignedCharDescriptionAtIndex:(int)anInt;
32-
- (NSString *)intDescriptionAtIndex:(int)anInt;
33-
- (NSString *)unsignedIntDescriptionAtIndex:(int)anInt;
34-
- (NSString *)shortDescriptionAtIndex:(int)anInt;
35-
- (NSString *)unsignedShortDescriptionAtIndex:(int)anInt;
36-
- (NSString *)longDescriptionAtIndex:(int)anInt;
37-
- (NSString *)unsignedLongDescriptionAtIndex:(int)anInt;
38-
- (NSString *)longLongDescriptionAtIndex:(int)anInt;
39-
- (NSString *)unsignedLongLongDescriptionAtIndex:(int)anInt;
40-
- (NSString *)doubleDescriptionAtIndex:(int)anInt;
41-
- (NSString *)floatDescriptionAtIndex:(int)anInt;
42-
- (NSString *)structDescriptionAtIndex:(int)anInt;
43-
- (NSString *)pointerDescriptionAtIndex:(int)anInt;
44-
- (NSString *)cStringDescriptionAtIndex:(int)anInt;
45-
- (NSString *)selectorDescriptionAtIndex:(int)anInt;
27+
- (NSString *)argumentDescriptionAtIndex:(NSInteger)argIndex;
28+
29+
- (NSString *)objectDescriptionAtIndex:(NSInteger)anInt;
30+
- (NSString *)charDescriptionAtIndex:(NSInteger)anInt;
31+
- (NSString *)unsignedCharDescriptionAtIndex:(NSInteger)anInt;
32+
- (NSString *)intDescriptionAtIndex:(NSInteger)anInt;
33+
- (NSString *)unsignedIntDescriptionAtIndex:(NSInteger)anInt;
34+
- (NSString *)shortDescriptionAtIndex:(NSInteger)anInt;
35+
- (NSString *)unsignedShortDescriptionAtIndex:(NSInteger)anInt;
36+
- (NSString *)longDescriptionAtIndex:(NSInteger)anInt;
37+
- (NSString *)unsignedLongDescriptionAtIndex:(NSInteger)anInt;
38+
- (NSString *)longLongDescriptionAtIndex:(NSInteger)anInt;
39+
- (NSString *)unsignedLongLongDescriptionAtIndex:(NSInteger)anInt;
40+
- (NSString *)doubleDescriptionAtIndex:(NSInteger)anInt;
41+
- (NSString *)floatDescriptionAtIndex:(NSInteger)anInt;
42+
- (NSString *)structDescriptionAtIndex:(NSInteger)anInt;
43+
- (NSString *)pointerDescriptionAtIndex:(NSInteger)anInt;
44+
- (NSString *)cStringDescriptionAtIndex:(NSInteger)anInt;
45+
- (NSString *)selectorDescriptionAtIndex:(NSInteger)anInt;
4646

4747
@end

‎Source/OCMock/NSInvocation+OCMAdditions.m

+27-27
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ @implementation NSInvocation(OCMAdditions)
2323
- (BOOL)hasCharPointerArgument
2424
{
2525
NSMethodSignature *signature = [self methodSignature];
26-
for(int i = 0; i < [signature numberOfArguments]; i++)
26+
for(NSUInteger i = 0; i < [signature numberOfArguments]; i++)
2727
{
2828
const char *argType = OCMTypeWithoutQualifiers([signature getArgumentTypeAtIndex:i]);
2929
if(strcmp(argType, "*") == 0)
@@ -33,9 +33,9 @@ - (BOOL)hasCharPointerArgument
3333
}
3434

3535

36-
- (id)getArgumentAtIndexAsObject:(int)argIndex
36+
- (id)getArgumentAtIndexAsObject:(NSInteger)argIndex
3737
{
38-
const char *argType = OCMTypeWithoutQualifiers([[self methodSignature] getArgumentTypeAtIndex:argIndex]);
38+
const char *argType = OCMTypeWithoutQualifiers([[self methodSignature] getArgumentTypeAtIndex:(NSUInteger)argIndex]);
3939

4040
if((strlen(argType) > 1) && (strchr("{^", argType[0]) == NULL) && (strcmp("@?", argType) != 0))
4141
[NSException raise:NSInvalidArgumentException format:@"Cannot handle argument type '%s'.", argType];
@@ -149,7 +149,7 @@ - (id)getArgumentAtIndexAsObject:(int)argIndex
149149
case '{': // structure
150150
{
151151
NSUInteger argSize;
152-
NSGetSizeAndAlignment([[self methodSignature] getArgumentTypeAtIndex:argIndex], &argSize, NULL);
152+
NSGetSizeAndAlignment([[self methodSignature] getArgumentTypeAtIndex:(NSUInteger)argIndex], &argSize, NULL);
153153
if(argSize == 0) // TODO: Can this happen? Is frameLength a good choice in that case?
154154
argSize = [[self methodSignature] frameLength];
155155
NSMutableData *argumentData = [[[NSMutableData alloc] initWithLength:argSize] autorelease];
@@ -172,19 +172,19 @@ - (NSString *)invocationDescription
172172

173173
NSArray *selectorParts = [NSStringFromSelector([self selector]) componentsSeparatedByString:@":"];
174174
NSMutableString *description = [[NSMutableString alloc] init];
175-
unsigned int i;
175+
NSUInteger i;
176176
for(i = 2; i < numberOfArgs; i++)
177177
{
178178
[description appendFormat:@"%@%@:", (i > 2 ? @" " : @""), [selectorParts objectAtIndex:(i - 2)]];
179-
[description appendString:[self argumentDescriptionAtIndex:i]];
179+
[description appendString:[self argumentDescriptionAtIndex:(NSInteger)i]];
180180
}
181181

182182
return [description autorelease];
183183
}
184184

185-
- (NSString *)argumentDescriptionAtIndex:(int)argIndex
185+
- (NSString *)argumentDescriptionAtIndex:(NSInteger)argIndex
186186
{
187-
const char *argType = OCMTypeWithoutQualifiers([[self methodSignature] getArgumentTypeAtIndex:argIndex]);
187+
const char *argType = OCMTypeWithoutQualifiers([[self methodSignature] getArgumentTypeAtIndex:(NSUInteger)argIndex]);
188188

189189
switch(*argType)
190190
{
@@ -213,7 +213,7 @@ - (NSString *)argumentDescriptionAtIndex:(int)argIndex
213213
}
214214

215215

216-
- (NSString *)objectDescriptionAtIndex:(int)anInt
216+
- (NSString *)objectDescriptionAtIndex:(NSInteger)anInt
217217
{
218218
id object;
219219

@@ -227,14 +227,14 @@ - (NSString *)objectDescriptionAtIndex:(int)anInt
227227
return [object description] ?: @"<nil description>";
228228
}
229229

230-
- (NSString *)boolDescriptionAtIndex:(int)anInt
230+
- (NSString *)boolDescriptionAtIndex:(NSInteger)anInt
231231
{
232232
bool value;
233233
[self getArgument:&value atIndex:anInt];
234234
return value? @"YES" : @"NO";
235235
}
236236

237-
- (NSString *)charDescriptionAtIndex:(int)anInt
237+
- (NSString *)charDescriptionAtIndex:(NSInteger)anInt
238238
{
239239
unsigned char buffer[128];
240240
memset(buffer, 0x0, 128);
@@ -248,7 +248,7 @@ - (NSString *)charDescriptionAtIndex:(int)anInt
248248
return [NSString stringWithFormat:@"'%c'", *buffer];
249249
}
250250

251-
- (NSString *)unsignedCharDescriptionAtIndex:(int)anInt
251+
- (NSString *)unsignedCharDescriptionAtIndex:(NSInteger)anInt
252252
{
253253
unsigned char buffer[128];
254254
memset(buffer, 0x0, 128);
@@ -257,108 +257,108 @@ - (NSString *)unsignedCharDescriptionAtIndex:(int)anInt
257257
return [NSString stringWithFormat:@"'%c'", *buffer];
258258
}
259259

260-
- (NSString *)intDescriptionAtIndex:(int)anInt
260+
- (NSString *)intDescriptionAtIndex:(NSInteger)anInt
261261
{
262262
int intValue;
263263

264264
[self getArgument:&intValue atIndex:anInt];
265265
return [NSString stringWithFormat:@"%d", intValue];
266266
}
267267

268-
- (NSString *)unsignedIntDescriptionAtIndex:(int)anInt
268+
- (NSString *)unsignedIntDescriptionAtIndex:(NSInteger)anInt
269269
{
270270
unsigned int intValue;
271271

272272
[self getArgument:&intValue atIndex:anInt];
273273
return [NSString stringWithFormat:@"%d", intValue];
274274
}
275275

276-
- (NSString *)shortDescriptionAtIndex:(int)anInt
276+
- (NSString *)shortDescriptionAtIndex:(NSInteger)anInt
277277
{
278278
short shortValue;
279279

280280
[self getArgument:&shortValue atIndex:anInt];
281281
return [NSString stringWithFormat:@"%hi", shortValue];
282282
}
283283

284-
- (NSString *)unsignedShortDescriptionAtIndex:(int)anInt
284+
- (NSString *)unsignedShortDescriptionAtIndex:(NSInteger)anInt
285285
{
286286
unsigned short shortValue;
287287

288288
[self getArgument:&shortValue atIndex:anInt];
289289
return [NSString stringWithFormat:@"%hu", shortValue];
290290
}
291291

292-
- (NSString *)longDescriptionAtIndex:(int)anInt
292+
- (NSString *)longDescriptionAtIndex:(NSInteger)anInt
293293
{
294294
long longValue;
295295

296296
[self getArgument:&longValue atIndex:anInt];
297297
return [NSString stringWithFormat:@"%ld", longValue];
298298
}
299299

300-
- (NSString *)unsignedLongDescriptionAtIndex:(int)anInt
300+
- (NSString *)unsignedLongDescriptionAtIndex:(NSInteger)anInt
301301
{
302302
unsigned long longValue;
303303

304304
[self getArgument:&longValue atIndex:anInt];
305305
return [NSString stringWithFormat:@"%lu", longValue];
306306
}
307307

308-
- (NSString *)longLongDescriptionAtIndex:(int)anInt
308+
- (NSString *)longLongDescriptionAtIndex:(NSInteger)anInt
309309
{
310310
long long longLongValue;
311311

312312
[self getArgument:&longLongValue atIndex:anInt];
313313
return [NSString stringWithFormat:@"%qi", longLongValue];
314314
}
315315

316-
- (NSString *)unsignedLongLongDescriptionAtIndex:(int)anInt
316+
- (NSString *)unsignedLongLongDescriptionAtIndex:(NSInteger)anInt
317317
{
318318
unsigned long long longLongValue;
319319

320320
[self getArgument:&longLongValue atIndex:anInt];
321321
return [NSString stringWithFormat:@"%qu", longLongValue];
322322
}
323323

324-
- (NSString *)doubleDescriptionAtIndex:(int)anInt
324+
- (NSString *)doubleDescriptionAtIndex:(NSInteger)anInt
325325
{
326326
double doubleValue;
327327

328328
[self getArgument:&doubleValue atIndex:anInt];
329329
return [NSString stringWithFormat:@"%f", doubleValue];
330330
}
331331

332-
- (NSString *)floatDescriptionAtIndex:(int)anInt
332+
- (NSString *)floatDescriptionAtIndex:(NSInteger)anInt
333333
{
334334
float floatValue;
335335

336336
[self getArgument:&floatValue atIndex:anInt];
337337
return [NSString stringWithFormat:@"%f", floatValue];
338338
}
339339

340-
- (NSString *)longDoubleDescriptionAtIndex:(int)anInt
340+
- (NSString *)longDoubleDescriptionAtIndex:(NSInteger)anInt
341341
{
342342
long double longDoubleValue;
343343

344344
[self getArgument:&longDoubleValue atIndex:anInt];
345345
return [NSString stringWithFormat:@"%Lf", longDoubleValue];
346346
}
347347

348-
- (NSString *)structDescriptionAtIndex:(int)anInt
348+
- (NSString *)structDescriptionAtIndex:(NSInteger)anInt
349349
{
350350
return [NSString stringWithFormat:@"(%@)", [[self getArgumentAtIndexAsObject:anInt] description]];
351351
}
352352

353-
- (NSString *)pointerDescriptionAtIndex:(int)anInt
353+
- (NSString *)pointerDescriptionAtIndex:(NSInteger)anInt
354354
{
355355
void *buffer;
356356

357357
[self getArgument:&buffer atIndex:anInt];
358358
return [NSString stringWithFormat:@"%p", buffer];
359359
}
360360

361-
- (NSString *)cStringDescriptionAtIndex:(int)anInt
361+
- (NSString *)cStringDescriptionAtIndex:(NSInteger)anInt
362362
{
363363
char buffer[104];
364364
char *cStringPtr;
@@ -369,7 +369,7 @@ - (NSString *)cStringDescriptionAtIndex:(int)anInt
369369
return [NSString stringWithFormat:@"\"%s\"", buffer];
370370
}
371371

372-
- (NSString *)selectorDescriptionAtIndex:(int)anInt
372+
- (NSString *)selectorDescriptionAtIndex:(NSInteger)anInt
373373
{
374374
SEL selectorValue;
375375

0 commit comments

Comments
 (0)