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

jschuh at chromium.org jschuh at chromium.org
Sun Feb 20 22:51:39 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit b375c98b7c109a37e07f0b5be2d3b55cdbee4518
Author: jschuh at chromium.org <jschuh at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 12 16:07:53 2011 +0000

    2011-01-12  Justin Schuh  <jschuh at chromium.org>
    
            Unreviewed build fix for debug strict compiles.
    
            Use fprintf for debug statements instead of fwrite, which caused compile failures
            in debug strict mode because of failure to check the fwrite return value.
    
            No behavior changed.
    
            * rendering/CounterNode.cpp:
            (WebCore::showTreeAndMark):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75611 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 5bf1073..c0dbe50 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-12  Justin Schuh  <jschuh at chromium.org>
+
+        Unreviewed build fix for debug strict compiles.
+
+        Use fprintf for debug statements instead of fwrite, which caused compile failures
+        in debug strict mode because of failure to check the fwrite return value.
+
+        No behavior changed.
+
+        * rendering/CounterNode.cpp:
+        (WebCore::showTreeAndMark):
+
 2010-12-29  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/Source/WebCore/rendering/CounterNode.cpp b/Source/WebCore/rendering/CounterNode.cpp
index ac83d5a..fe2148a 100644
--- a/Source/WebCore/rendering/CounterNode.cpp
+++ b/Source/WebCore/rendering/CounterNode.cpp
@@ -247,9 +247,9 @@ static void showTreeAndMark(const CounterNode* node)
         root = root->parent();
 
     for (const CounterNode* current = root; current; current = current->nextInPreOrder()) {
-        fwrite((current == node) ? "*" : " ", 1, 1, stderr);
+        fprintf(stderr, "%c", (current == node) ? '*' : ' ');
         for (const CounterNode* parent = current; parent && parent != root; parent = parent->parent())
-            fwrite("  ", 1, 2, stderr);
+            fprintf(stderr, "    ");
         fprintf(stderr, "%p %s: %d %d P:%p PS:%p NS:%p R:%p\n",
             current, current->actsAsReset() ? "reset____" : "increment", current->value(),
             current->countInParent(), current->parent(), current->previousSibling(),

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list