Changeset 2612 in webkit for trunk/JavaScriptCore/kjs/date_object.cpp

Timestamp:

Nov 8, 2002, 11:46:17 PM (23 years ago)

Author:

darin

Message:

• kjs/date_object.cpp: (ctimeUsingCF): Added. (timeUsingCF): Added.

File:

• trunk/JavaScriptCore/kjs/date_object.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -65 +65 @@
 #include <CoreFoundation/CoreFoundation.h>
 
+#define ctime(x) ctimeUsingCF(x)
 #define gmtime(x) gmtimeUsingCF(x)
 #define localtime(x) localtimeUsingCF(x)
 #define mktime(x) mktimeUsingCF(x)
-
-struct tm *tmUsingCF(time_t tv, CFTimeZoneRef timeZone)
+//#define strftime(a, b, c, d) notAllowedToCall()
+
+struct tm *tmUsingCF(time_t clock, CFTimeZoneRef timeZone)
 {
     static struct tm result;
     static char timeZoneCString[128];
     
-    CFAbsoluteTime absoluteTime = tv - kCFAbsoluteTimeIntervalSince1970;
-    
+    CFAbsoluteTime absoluteTime = clock - kCFAbsoluteTimeIntervalSince1970;
     CFGregorianDate date = CFAbsoluteTimeGetGregorianDate(absoluteTime, timeZone);
-    
+
     CFStringRef abbreviation = CFTimeZoneCopyAbbreviation(timeZone, absoluteTime);
-    
     CFStringGetCString(abbreviation, timeZoneCString, sizeof(timeZoneCString), kCFStringEncodingASCII);
+    CFRelease(abbreviation);
 
     result.tm_sec = (int)date.second;
@@ -94 +95 @@
     result.tm_zone = timeZoneCString;
     
-    CFRelease(abbreviation);
+    return &result;
+}
+
+char *ctimeUsingCF(const time_t *clock)
+{
+    static char result[26];
     
-    return &result;
-}
-
-struct tm *gmtimeUsingCF(const time_t *tv)
+    CFTimeZoneRef timeZone = CFTimeZoneCopyDefault();
+
+    CFAbsoluteTime absoluteTime = *clock - kCFAbsoluteTimeIntervalSince1970;
+    CFGregorianDate date = CFAbsoluteTimeGetGregorianDate(absoluteTime, timeZone);
+    
+    const char * const weekdayName[7] = { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" };
+    const char * const monthName[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+    
+    sprintf(result, "%s %s %02d %02d:%02d:%02.f %04ld\n",
+        weekdayName[CFAbsoluteTimeGetDayOfWeek(absoluteTime, timeZone) - 1],
+        monthName[date.month - 1], date.day, date.hour, date.minute, date.second, date.year);
+    
+    CFRelease(timeZone);
+    
+    return result;
+}
+
+struct tm *gmtimeUsingCF(const time_t *clock)
 {
     static CFTimeZoneRef timeZoneUTC = CFTimeZoneCreateWithName(NULL, CFSTR("UTC"), TRUE);
-    return tmUsingCF(*tv, timeZoneUTC);
-}
-
-struct tm *localtimeUsingCF(const time_t *tv)
+    return tmUsingCF(*clock, timeZoneUTC);
+}
+
+struct tm *localtimeUsingCF(const time_t *clock)
 {
     CFTimeZoneRef timeZone = CFTimeZoneCopyDefault();
-    struct tm *result = tmUsingCF(*tv, timeZone);
+    struct tm *result = tmUsingCF(*clock, timeZone);
     CFRelease(timeZone);
     return result;
@@ -130 +150 @@
 
     return (time_t)(absoluteTime + kCFAbsoluteTimeIntervalSince1970);
+}
+
+time_t timeUsingCF(time_t *clock)
+{
+    time_t result = (time_t)(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970);
+    if (clock) {
+        *clock = result;
+    }
+    return result;
 }