File tree Expand file tree Collapse file tree 5 files changed +7
-7
lines changed Expand file tree Collapse file tree 5 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -355,7 +355,7 @@ - (BOOL)applyPatch:(NSString *)hunk stage:(BOOL)stage reverse:(BOOL)reverse
355
355
356
356
- (NSString *)diffForFile : (PBChangedFile *)file staged : (BOOL )staged contextLines : (NSUInteger )context
357
357
{
358
- NSString *parameter = [NSString stringWithFormat: @" -U%u " , context];
358
+ NSString *parameter = [NSString stringWithFormat: @" -U%ld " , context];
359
359
if (staged) {
360
360
NSString *indexPath = [@" :0:" stringByAppendingString: file.path];
361
361
Original file line number Diff line number Diff line change @@ -219,7 +219,7 @@ - (void) addRef: (PBGitRef *) ref fromParameters: (NSArray *) components
219
219
sha = [components objectAtIndex: 2 ];
220
220
221
221
NSMutableArray * curRefs;
222
- if (curRefs = [refs objectForKey: sha])
222
+ if (( curRefs = [refs objectForKey: sha]) )
223
223
[curRefs addObject: ref];
224
224
else
225
225
[refs setObject: [NSMutableArray arrayWithObject: ref] forKey: sha];
Original file line number Diff line number Diff line change @@ -156,7 +156,7 @@ - (void) walkRevisionListWithSpecifier: (PBGitRevSpecifier*) rev
156
156
if (parentString.size () != 0 )
157
157
{
158
158
if (((parentString.size () + 1 ) % 41 ) != 0 ) {
159
- NSLog (@" invalid parents: %i " , parentString.size());
159
+ NSLog (@" invalid parents: %ld " , parentString.size());
160
160
continue ;
161
161
}
162
162
int nParents = (parentString.size () + 1 ) / 41 ;
Original file line number Diff line number Diff line change @@ -148,15 +148,15 @@ - (NSString *)textContents
148
148
return [NSString stringWithFormat: @" This is a tree with path %@ " , [self fullPath ]];
149
149
150
150
if ([self hasBinaryAttributes ])
151
- return [NSString stringWithFormat: @" %@ appears to be a binary file of %d bytes" , [self fullPath ], [self fileSize ]];
151
+ return [NSString stringWithFormat: @" %@ appears to be a binary file of %lld bytes" , [self fullPath ], [self fileSize ]];
152
152
153
153
if ([self fileSize ] > 52428800 ) // ~50MB
154
- return [NSString stringWithFormat: @" %@ is too big to be displayed (%d bytes)" , [self fullPath ], [self fileSize ]];
154
+ return [NSString stringWithFormat: @" %@ is too big to be displayed (%lld bytes)" , [self fullPath ], [self fileSize ]];
155
155
156
156
NSString * contents = [self contents ];
157
157
158
158
if ([self hasBinaryHeader: contents])
159
- return [NSString stringWithFormat: @" %@ appears to be a binary file of %d bytes" , [self fullPath ], [self fileSize ]];
159
+ return [NSString stringWithFormat: @" %@ appears to be a binary file of %lld bytes" , [self fullPath ], [self fileSize ]];
160
160
161
161
return contents;
162
162
}
Original file line number Diff line number Diff line change 33
33
// Now attempt to connect, allowing the app time to startup
34
34
int attempt;
35
35
for (attempt = 0 ; proxy == nil && attempt < 50 ; ++attempt) {
36
- if (proxy = connect ())
36
+ if (( proxy = connect () ))
37
37
return proxy;
38
38
39
39
usleep (15000 );
You can’t perform that action at this time.
0 commit comments