Skip to content

Ios warning fixes #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Ios warning fixes #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd3ed80
Fix compile warnings on iOS.
gauthierm Dec 25, 2013
3b4a181
Update project to show library target correctly.
gauthierm Dec 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions MPOAuth.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,6 +886,8 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MPOAuth" */;
compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
Expand Down Expand Up @@ -1307,26 +1309,26 @@
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
SDKROOT = "";
SDKROOT = iphoneos;
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
SDKROOT = "";
SDKROOT = iphoneos;
};
name = Release;
};
Expand Down Expand Up @@ -1612,6 +1614,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
Expand All @@ -1627,7 +1630,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
Expand Down
2 changes: 1 addition & 1 deletion Source/Framework/MPOAuthCredentialConcreteStore+KeychainAdditionsiPhone.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,4 @@ - (void)removeValueFromKeychainUsingName:(NSString *)inName {

@end

#endif TARGET_OS_IPHONE
#endif // TARGET_OS_IPHONE
2 changes: 1 addition & 1 deletion Source/Framework/MPOAuthCredentialConcreteStore.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ - (NSString *)signingKey {
NSString *consumerSecret = [[self consumerSecret] stringByAddingURIPercentEscapesUsingEncoding:NSUTF8StringEncoding];
NSString *tokenSecret = [[self tokenSecret] stringByAddingURIPercentEscapesUsingEncoding:NSUTF8StringEncoding];

return [NSString stringWithFormat:@"%@%&%@", consumerSecret, tokenSecret];
return [NSString stringWithFormat:@"%@&%@", consumerSecret, tokenSecret];
}

#pragma mark -
Expand Down
2 changes: 1 addition & 1 deletion Source/Framework/MPOAuthURLRequest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ - (NSURLRequest *)urlRequestSignedWithSecret:(NSString *)inSecret usingMethod:(
MPLog(@"postDataString - %@", postDataString);

[aRequest setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"];
[aRequest setValue:[NSString stringWithFormat:@"%d", [postData length]] forHTTPHeaderField:@"Content-Length"];
[aRequest setValue:[NSString stringWithFormat:@"%lu", (unsigned long)[postData length]] forHTTPHeaderField:@"Content-Length"];
[aRequest setHTTPBody:postData];
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion Source/Framework/MPURLRequestParameter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ + (NSDictionary *)parameterDictionaryFromString:(NSString *)inString {
+ (NSString *)parameterStringForParameters:(NSArray *)inParameters {
NSMutableString *queryString = [[NSMutableString alloc] init];
int i = 0;
int parameterCount = [inParameters count];
unsigned long parameterCount = [inParameters count];
MPURLRequestParameter *aParameter = nil;

for (; i < parameterCount; i++) {
Expand Down
4 changes: 2 additions & 2 deletions Source/Framework/NSURL+MPURLParameterAdditions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ - (BOOL)domainMatches:(NSString *)inString {
NSString *domain = [self host];
matches = [domain isIPAddress] && [domain isEqualToString:inString];

int domainLength = [domain length];
int requestedDomainLength = [inString length];
unsigned long domainLength = [domain length];
unsigned long requestedDomainLength = [inString length];

if (!matches) {
if (domainLength > requestedDomainLength) {
Expand Down