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

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 7513bcc5fc5aa27b17971f7d6b6997fd12b80386
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 9 23:29:10 2010 +0000

    2010-08-09  Evan Martin  <evan at chromium.org>
    
            Reviewed by Tony Chang.
    
            [chromium] DRT error print statement incorrectly tries to print a FILE*
            https://bugs.webkit.org/show_bug.cgi?id=43747
    
            * DumpRenderTree/chromium/ImageDiff.cpp:
            (writeFile): pass the correct pointer.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d746f7d..ee919cc 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-09  Evan Martin  <evan at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] DRT error print statement incorrectly tries to print a FILE*
+        https://bugs.webkit.org/show_bug.cgi?id=43747
+
+        * DumpRenderTree/chromium/ImageDiff.cpp:
+        (writeFile): pass the correct pointer.
+
 2010-08-09  Victor Wang  <victorw at chromium.org>
 
         Reviewed by Ojan Vafai.
diff --git a/WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp b/WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp
index 27e9946..d1adc3d 100644
--- a/WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp
@@ -321,12 +321,12 @@ static bool writeFile(const char* outFile, const unsigned char* data, size_t dat
 {
     FILE* file = fopen(outFile, "wb");
     if (!file) {
-        fprintf(stderr, "ImageDiff: Unable to create file \"%s\"\n", file);
+        fprintf(stderr, "ImageDiff: Unable to create file \"%s\"\n", outFile);
         return false;
     }
     if (dataSize != fwrite(data, 1, dataSize, file)) {
         fclose(file);
-        fprintf(stderr, "ImageDiff: Unable to write data to file \"%s\"\n", file);
+        fprintf(stderr, "ImageDiff: Unable to write data to file \"%s\"\n", outFile);
         return false;
     }
     fclose(file);

-- 
WebKit Debian packaging