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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3bdf58707e8bb475906983870f206dfe3cdc2d33
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 14:44:13 2010 +0000

    2010-09-09  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] Get ImageDiff building on Win32
            https://bugs.webkit.org/show_bug.cgi?id=45353
    
            * DumpRenderTree/gtk/ImageDiff.cpp:
            (main): Switch from using strtok to g_strsplit.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67083 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e232ce6..d7bc5a1 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-09  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Get ImageDiff building on Win32
+        https://bugs.webkit.org/show_bug.cgi?id=45353
+
+        * DumpRenderTree/gtk/ImageDiff.cpp:
+        (main): Switch from using strtok to g_strsplit.
+
 2010-09-09  Zoltan Horvath  <zoltan at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebKitTools/DumpRenderTree/gtk/ImageDiff.cpp b/WebKitTools/DumpRenderTree/gtk/ImageDiff.cpp
index c40b232..7e2744a 100644
--- a/WebKitTools/DumpRenderTree/gtk/ImageDiff.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/ImageDiff.cpp
@@ -199,10 +199,15 @@ int main(int argc, char* argv[])
             *newLineCharacter = '\0';
 
         if (!strncmp("Content-Length: ", buffer, 16)) {
-            char* context;
-            strtok_r(buffer, " ", &context);
-            long imageSize = strtol(strtok_r(0, " ", &context), 0, 10);
+            gchar** tokens = g_strsplit(buffer, " ", 0);
+            if (!tokens[1]) {
+                g_strfreev(tokens);
+                printf("Error, image size must be specified..\n");
+                return 1;
+            }
 
+            long imageSize = strtol(tokens[1], 0, 10);
+            g_strfreev(tokens);
             if (imageSize > 0 && !actualImage) {
                 if (!(actualImage = readPixbufFromStdin(imageSize))) {
                     printf("Error, could not read actual image.\n");

-- 
WebKit Debian packaging