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

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ef5dd2f8dbf0cd24df888456eb051cc569f2a210
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 15:02:45 2010 +0000

    Fix warnings: unknown conversion type character 'l' in format
    https://bugs.webkit.org/show_bug.cgi?id=43359
    
    Reviewed by Kenneth Rohde Christiansen.
    
    * loader/FTPDirectoryParser.cpp: Use %I64u format specifier instead of %llu on Windows.
    (WebCore::parseOneFTPLine):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65426 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 787dbc2..2b8bce4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-16  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fix warnings: unknown conversion type character 'l' in format
+        https://bugs.webkit.org/show_bug.cgi?id=43359
+
+        * loader/FTPDirectoryParser.cpp: Use %I64u format specifier instead of %llu on Windows.
+        (WebCore::parseOneFTPLine):
+
 2010-08-16  Ariya Hidayat  <ariya at sencha.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/loader/FTPDirectoryParser.cpp b/WebCore/loader/FTPDirectoryParser.cpp
index 142f2a3..f6a74de 100644
--- a/WebCore/loader/FTPDirectoryParser.cpp
+++ b/WebCore/loader/FTPDirectoryParser.cpp
@@ -188,9 +188,13 @@ FTPEntryType parseOneFTPLine(const char* line, ListState& state, ListResult& res
               if (pos < linelen && line[pos] == ',')
               {
                 unsigned long long seconds = 0;
+#if OS(WINDOWS)
+                sscanf(p + 1, "%I64u", &seconds);
+#else
                 sscanf(p + 1, "%llu", &seconds);
+#endif
                 time_t t = static_cast<time_t>(seconds);
-                
+
                 // FIXME: This code has the year 2038 bug
                 gmtime_r(&t, &result.modifiedTime);
                 result.modifiedTime.tm_year += 1900;

-- 
WebKit Debian packaging