Ben Copsey

Declare that we implement NSXMLParserDelegate protocol on Snow Leopard

Stop using c99 loop variable declarations, use unsigned ints
... ... @@ -21,7 +21,7 @@
#import "ASIInputStream.h"
// Automatically set on build
NSString *ASIHTTPRequestVersion = @"v1.5-16 2010-01-14";
NSString *ASIHTTPRequestVersion = @"v1.5-17 2010-01-14";
NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
... ...
... ... @@ -8,8 +8,13 @@
@class ASICloudFilesContainer;
// Prevent warning about missing NSXMLParserDelegate on Leopard and iPhone
#if !TARGET_OS_IPHONE && MAC_OS_X_VERSION_10_5 < MAC_OS_X_VERSION_MAX_ALLOWED
@interface ASICloudFilesContainerXMLParserDelegate : NSObject <NSXMLParserDelegate> {
#else
@interface ASICloudFilesContainerXMLParserDelegate : NSObject {
#endif
NSMutableArray *containerObjects;
// Internally used while parsing the response
... ...
... ... @@ -8,8 +8,14 @@
@class ASICloudFilesObject;
@interface ASICloudFilesObjectRequest : ASICloudFilesRequest {
// Prevent warning about missing NSXMLParserDelegate on Leopard and iPhone
#if !TARGET_OS_IPHONE && MAC_OS_X_VERSION_10_5 < MAC_OS_X_VERSION_MAX_ALLOWED
@interface ASICloudFilesObjectRequest : ASICloudFilesRequest <NSXMLParserDelegate> {
#else
@interface ASICloudFilesObjectRequest : ASICloudFilesRequest {
#endif
NSString *accountName;
NSString *containerName;
... ...
... ... @@ -134,13 +134,15 @@
NSDictionary *headers = [self responseHeaders];
NSArray *keys = [headers allKeys];
for (int i = 0; i < [keys count]; i++) {
NSUInteger i;
for (i = 0; i < [keys count]; i++) {
NSString *key = [keys objectAtIndex:i];
NSString *value = [headers objectForKey:key];
NSRange range = [key rangeOfString:@"X-Object-Meta-"];
NSRange metaRange = [key rangeOfString:@"X-Object-Meta-"];
if (range.location == 0) {
[object.metadata setObject:value forKey:[key substringFromIndex:range.length]];
if (metaRange.location == 0) {
[object.metadata setObject:value forKey:[key substringFromIndex:metaRange.length]];
}
}
... ... @@ -165,7 +167,8 @@
// add metadata to headers
if (metadata) {
NSArray *keys = [metadata allKeys];
for (int i = 0; i < [keys count]; i++) {
NSUInteger i;
for (i = 0; i < [keys count]; i++) {
NSString *key = [keys objectAtIndex:i];
NSString *value = [metadata objectForKey:key];
[request addRequestHeader:[NSString stringWithFormat:@"X-Object-Meta-%@", key] value:value];
... ... @@ -189,7 +192,8 @@
// add metadata to headers
if (metadata) {
NSArray *keys = [metadata allKeys];
for (int i = 0; i < [keys count]; i++) {
NSUInteger i;
for (i = 0; i < [keys count]; i++) {
NSString *key = [keys objectAtIndex:i];
NSString *value = [metadata objectForKey:key];
[request addRequestHeader:[NSString stringWithFormat:@"X-Object-Meta-%@", key] value:value];
... ...
... ... @@ -27,7 +27,6 @@ typedef enum _ASIS3ErrorType {
@interface ASIS3Request : ASIHTTPRequest <NSCopying, NSXMLParserDelegate> {
#else
@interface ASIS3Request : ASIHTTPRequest <NSCopying> {
#endif
// Your S3 access key. Set it on the request, or set it globally using [ASIS3Request setSharedAccessKey:]
NSString *accessKey;
... ...
... ... @@ -71,7 +71,8 @@ static NSString *apiKey = @"";
containers = [containerListRequest containers];
GHAssertTrue([containers count] > 0, @"Failed to list containers");
for (int i = 0; i < [containers count]; i++) {
NSUInteger i;
for (i = 0; i < [containers count]; i++) {
ASICloudFilesContainer *container = [containers objectAtIndex:i];
GHAssertNotNil(container.name, @"Failed to parse container");
}
... ... @@ -141,7 +142,8 @@ static NSString *apiKey = @"";
NSArray *containers = [objectListRequest objects];
GHAssertTrue([containers count] > 0, @"Failed to list objects");
for (int i = 0; i < [containers count]; i++) {
NSUInteger i;
for (i = 0; i < [containers count]; i++) {
ASICloudFilesObject *object = [containers objectAtIndex:i];
GHAssertNotNil(object.name, @"Failed to parse object");
}
... ...