[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mthole at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 53931a38fe650960f53e941bec382bc4cc35a599
Author: mthole at apple.com <mthole at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 3 21:45:54 2010 +0000

    Tweak coding style (follow-up to r71264).
    
    Reviewed by Darin Adler.
    
    * platform/mac/Language.mm:
    (WebCore::createHTTPStyleLanguageCode): Style tweaks.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71271 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2179be6..3728bac 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-03  Mike Thole  <mthole at apple.com>
+
+        Reviewed by Darin Adler.
+        
+        Tweak coding style (follow-up to r71264).
+        
+        * platform/mac/Language.mm:
+        (WebCore::createHTTPStyleLanguageCode): Style tweaks.
+
 2010-11-03  Darin Adler  <darin at apple.com>
 
         Updated Xcode projects by opening them with Xcode 3.2.4.
diff --git a/WebCore/platform/mac/Language.mm b/WebCore/platform/mac/Language.mm
index 7338e0a..c242e9e 100644
--- a/WebCore/platform/mac/Language.mm
+++ b/WebCore/platform/mac/Language.mm
@@ -59,7 +59,6 @@ namespace WebCore {
 static NSString *createHTTPStyleLanguageCode(NSString *languageCode)
 {
     ASSERT(isMainThread());
-    NSString *httpStyleLanguageCode = nil;
 
     // Look up the language code using CFBundle.
     CFStringRef preferredLanguageCode = wkCopyCFLocalizationPreferredName((CFStringRef)languageCode);
@@ -70,13 +69,14 @@ static NSString *createHTTPStyleLanguageCode(NSString *languageCode)
     // Make the string lowercase.
     NSString *lowercaseLanguageCode = [languageCode lowercaseString];
     
+    NSString *httpStyleLanguageCode;
+    
     // Turn a '_' into a '-' if it appears after a 2-letter language code.
     if ([lowercaseLanguageCode length] >= 3 && [lowercaseLanguageCode characterAtIndex:2] == '_') {
         NSMutableString *mutableLanguageCode = [lowercaseLanguageCode mutableCopy];
         [mutableLanguageCode replaceCharactersInRange:NSMakeRange(2, 1) withString:@"-"];
         httpStyleLanguageCode = mutableLanguageCode;
-    }
-    else
+    } else
         httpStyleLanguageCode = [lowercaseLanguageCode retain];
     
     if (preferredLanguageCode)

-- 
WebKit Debian packaging