Removing GNU-style ?: operators. Thanks for the report, Uli.

seanm · Dec 10, 2009 · a032358 · a032358
1 parent b546304
commit a032358
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/SUAppcast.m b/SUAppcast.m
@@ -223,7 +223,7 @@ - (NSXMLNode *)bestNodeInNodes:(NSArray *)nodes
     while ((node = [nodeEnum nextObject]))
     {
         lang = [[node attributeForName:@"xml:lang"] stringValue];
-        [languages addObject:(lang ?: @"")];
+        [languages addObject:(lang ? lang : @"")];
     }
     lang = [[NSBundle preferredLocalizationsFromArray:languages] objectAtIndex:0];
     i = [languages indexOfObject:([languages containsObject:lang] ? lang : @"")];

diff --git a/SUHost.m b/SUHost.m
@@ -195,7 +195,7 @@ - (void)setBool:(BOOL)value forUserDefaultsKey:(NSString *)defaultName
 }
 
 - (id)objectForKey:(NSString *)key {
-    return [self objectForUserDefaultsKey:key] ?: [self objectForInfoDictionaryKey:key];
+    return [self objectForUserDefaultsKey:key] ? [self objectForUserDefaultsKey:key] : [self objectForInfoDictionaryKey:key];
 }
 
 - (BOOL)boolForKey:(NSString *)key {

diff --git a/SUUpdater.m b/SUUpdater.m
@@ -313,7 +313,8 @@ - (NSString *)userAgentString
 	if (customUserAgentString)
 		return customUserAgentString;
 
-	NSString *userAgent = [NSString stringWithFormat:@"%@/%@ Sparkle/%@", [host name], [host displayVersion], [SPARKLE_BUNDLE objectForInfoDictionaryKey:@"CFBundleVersion"] ?: nil];
+	NSString *version = [SPARKLE_BUNDLE objectForInfoDictionaryKey:@"CFBundleVersion"];
+	NSString *userAgent = [NSString stringWithFormat:@"%@/%@ Sparkle/%@", [host name], [host displayVersion], version ? version : @"?"];
 	NSData *cleanedAgent = [userAgent dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES];
 	return [[[NSString alloc] initWithData:cleanedAgent encoding:NSASCIIStringEncoding] autorelease];
 }