Changeset 54256 in webkit

Timestamp:

Feb 2, 2010 2:50:41 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-02-02 Kwang Yul Seo <​skyul@company100.net>

Reviewed by Eric Seidel.

Use WTF::getLocalTime instead of localtime_r in FTPDirectoryDocument
​https://bugs.webkit.org/show_bug.cgi?id=34409

Platform guards for localtime_r are not needed because we already have
WTF::getLocalTime which does the same thing.

• loader/FTPDirectoryDocument.cpp: (WebCore::processFileDateString):
• loader/FTPDirectoryParser.cpp: (WebCore::gmtimeQt):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FTPDirectoryDocument.cpp (modified) (3 diffs)
• loader/FTPDirectoryParser.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-02  Kwang Yul Seo  <skyul@company100.net>
+
+        Reviewed by Eric Seidel.
+
+        Use WTF::getLocalTime instead of localtime_r in FTPDirectoryDocument
+        https://bugs.webkit.org/show_bug.cgi?id=34409
+
+        Platform guards for localtime_r are not needed because we already have
+        WTF::getLocalTime which does the same thing.
+
+        * loader/FTPDirectoryDocument.cpp:
+        (WebCore::processFileDateString):
+        * loader/FTPDirectoryParser.cpp:
+        (WebCore::gmtimeQt):
+
 2010-02-02  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/loader/FTPDirectoryDocument.cpp

@@ -39 +39 @@
 #include "SharedBuffer.h"
 #include "Text.h"
+
+#include <wtf/CurrentTime.h>
 #include <wtf/StdLibExtras.h>
-
-#if PLATFORM(QT)
-#include <QDateTime>
-// On Windows, use the threadsafe *_r functions provided by pthread.
-#elif OS(WINDOWS) && (USE(PTHREADS) || HAVE(PTHREAD_H))
-#include <pthread.h>
-#endif
 
 using namespace std;
@@ -201 +196 @@
 }
 
-#if PLATFORM(QT)
-
-/*!
- Replacement for localtime_r() which is not available on MinGW.
-
- We use this on all of Qt's platforms for portability.
- */
-struct tm gmtimeQt(const QDateTime &input)
-{
-    tm result;
-
-    const QDate date(input.date());
-    result.tm_year = date.year() - 1900;
-    result.tm_mon = date.month();
-    result.tm_mday = date.day();
-    result.tm_wday = date.dayOfWeek();
-    result.tm_yday = date.dayOfYear();
-
-    const QTime time(input.time());
-    result.tm_sec = time.second();
-    result.tm_min = time.minute();
-    result.tm_hour = time.hour();
-
-    return result;
-}
-
-static struct tm *localTimeQt(const time_t *const timep, struct tm *result)
-{
-    const QDateTime dt(QDateTime::fromTime_t(*timep));
-    *result = WebCore::gmtimeQt(dt.toLocalTime());
-    return result;
-}
-
-#define localtime_r(x, y) localTimeQt(x, y)
-#elif OS(WINDOWS) && !defined(localtime_r)
-#if defined(_MSC_VER) && (_MSC_VER >= 1400) 
-#define localtime_r(x, y) localtime_s((y), (x))
-#else /* !_MSC_VER */ 
-#define localtime_r(x,y) (localtime(x)?(*(y)=*localtime(x),(y)):0)
-#endif
-#endif
-
 static String processFileDateString(const FTPTime& fileTime)
 {
@@ -268 +221 @@
     struct tm now;
     time_t now_t = time(NULL);
-    localtime_r(&now_t, &now);
+    getLocalTime(&now_t, &now);
     
     // localtime does "year = current year - 1900", compensate for that for readability and comparison purposes

trunk/WebCore/loader/FTPDirectoryParser.cpp

@@ -39 +39 @@
 namespace WebCore {
 #if PLATFORM(QT) && defined(Q_WS_WIN32)
-// Defined in FTPDirectoryDocument.cpp.
-struct tm gmtimeQt(const QDateTime &input);
+
+// Replacement for gmtime_r() which is not available on MinGW.
+// We use this on Win32 Qt platform for portability.
+struct tm gmtimeQt(const QDateTime& input)
+{
+    tm result;
+
+    QDate date(input.date());
+    result.tm_year = date.year() - 1900;
+    result.tm_mon = date.month();
+    result.tm_mday = date.day();
+    result.tm_wday = date.dayOfWeek();
+    result.tm_yday = date.dayOfYear();
+
+    QTime time(input.time());
+    result.tm_sec = time.second();
+    result.tm_min = time.minute();
+    result.tm_hour = time.hour();
+
+    return result;
+}
 
 static struct tm *gmtimeQt(const time_t *const timep, struct tm *result)