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

Timestamp:

Mar 2, 2007, 11:55:21 AM (18 years ago)

Author:

aroben

Message:

Reviewed by Kevin M.

Try to fix the Qt build.

• kjs/DateMath.cpp: (KJS::msToGregorianDateTime): Removed unnecessary "struct" keyword.
• kjs/DateMath.h: Moved forward declarations to the top of the file before they are used.
• kjs/date_object.cpp: (KJS::formatLocaleDate): Changed to take a const GregorianDateTime& since GregorianDateTime is Noncopyable.

File:

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

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -159 +159 @@
 enum LocaleDateTimeFormat { LocaleDateAndTime, LocaleDate, LocaleTime };
  
-static JSCell* formatLocaleDate(GregorianDateTime gdt, const LocaleDateTimeFormat format)
+static JSCell* formatLocaleDate(const GregorianDateTime& gdt, const LocaleDateTimeFormat format)
 {
     static const char* formatStrings[] = {"%#c", "%#x", "%X"};
@@ -165 +165 @@
     // Offset year if needed
     struct tm localTM = gdt;
-    gdt.year += 1900;
-    bool yearNeedsOffset = gdt.year < 1900 || gdt.year > 2038;
+    int year = gdt.year + 1900;
+    bool yearNeedsOffset = year < 1900 || year > 2038;
     if (yearNeedsOffset) {
-        localTM.tm_year = equivalentYearForDST(gdt.year) - 1900;
+        localTM.tm_year = equivalentYearForDST(year) - 1900;
      }
  
@@ -186 +186 @@
         snprintf(yearString, yearLen, "%d", localTM.tm_year + 1900);
         char* yearLocation = strstr(timebuffer, yearString);
-        snprintf(yearString, yearLen, "%d", gdt.year);
+        snprintf(yearString, yearLen, "%d", year);
  
         strncpy(yearLocation, yearString, yearLen - 1);