Permalink
Browse files

Merge branch 'master' of https://github.com/OpenFibers/asi-http-request

… into OpenFibers-master

Conflicts (already fixed so discarded these):
	Classes/ASIDataCompressor.m
	Classes/ASIDataDecompressor.m
(and changed ASIS3BucketRequest.m to avoid the need to cast)
  • Loading branch information...
2 parents e330685 + 621867f commit 3ed0b3c945937bb8e4b96c08bd3382d7839fb86e @jogu jogu committed Jul 30, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 Classes/S3/ASIS3BucketRequest.m
  2. +3 −3 External/Reachability/Reachability.m
@@ -98,7 +98,7 @@ - (void)buildURL
[queryParts addObject:[NSString stringWithFormat:@"delimiter=%@",[[self delimiter] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
}
if ([self maxResultCount] > 0) {
- [queryParts addObject:[NSString stringWithFormat:@"max-keys=%hi",[self maxResultCount]]];
+ [queryParts addObject:[NSString stringWithFormat:@"max-keys=%i",[self maxResultCount]]];
}
if ([queryParts count]) {
NSString* template = @"%@?%@";
@@ -161,13 +161,13 @@ static void logNetworkStatus_(const char *name, int line, NetworkStatus status)
switch (status) {
case kNotReachable:
- statusString = [NSString stringWithString: @"Not Reachable"];
+ statusString = @"Not Reachable";
break;
case kReachableViaWWAN:
- statusString = [NSString stringWithString: @"Reachable via WWAN"];
+ statusString = @"Reachable via WWAN";
break;
case kReachableViaWiFi:
- statusString = [NSString stringWithString: @"Reachable via WiFi"];
+ statusString = @"Reachable via WiFi";
break;
}

0 comments on commit 3ed0b3c

Please sign in to comment.