[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit a14c73d5b33b13aec41600279fa278d41626fe93
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 18:28:35 2011 +0000

    2011-01-25  Marcilio Mendonca  <mamendonca at rim.com>
    
            Reviewed by Darin Adler.
    
            Bug 53087: Refactoring: replaced a hanging "else" with a "return"
            statement
            https://bugs.webkit.org/show_bug.cgi?id=53087.
    
            Refactoring work: Replaced a hanging "else" within an #if PLATFORM(M
            with a "return" so that the code is more readable and less error pro
            (e.g., "else" doesn't use braces so adding extra lines to the else
            block won't have any effect; even worse, code still compiles
            successfully.
    
            * wtf/Assertions.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76609 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index eb84eb0..93f8d54 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-25  Marcilio Mendonca  <mamendonca at rim.com>
+
+        Reviewed by Darin Adler.
+
+        Bug 53087: Refactoring: replaced a hanging "else" with a "return"
+        statement
+        https://bugs.webkit.org/show_bug.cgi?id=53087.
+
+        Refactoring work: Replaced a hanging "else" within an #if PLATFORM(M
+        with a "return" so that the code is more readable and less error pro
+        (e.g., "else" doesn't use braces so adding extra lines to the else
+        block won't have any effect; even worse, code still compiles
+        successfully.
+
+        * wtf/Assertions.cpp:
+
 2011-01-24  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Eric Seidel.
diff --git a/Source/JavaScriptCore/wtf/Assertions.cpp b/Source/JavaScriptCore/wtf/Assertions.cpp
index 1841150..47ef1b5 100644
--- a/Source/JavaScriptCore/wtf/Assertions.cpp
+++ b/Source/JavaScriptCore/wtf/Assertions.cpp
@@ -101,7 +101,8 @@ static void vprintf_stderr_common(const char* format, va_list args)
         free(buffer);
         CFRelease(str);
         CFRelease(cfFormat);
-    } else
+        return;
+    }
 #elif PLATFORM(BREWMP)
     // When str is 0, the return value is the number of bytes needed
     // to accept the result including null termination.

-- 
WebKit Debian packaging