Changeset 41685 in webkit for trunk/JavaScriptCore/runtime/DateMath.cpp

Timestamp:

Mar 13, 2009, 2:52:19 PM (16 years ago)

Author:

[email protected]

Message:

2009-03-13 Norbert Leser <​[email protected]>

Reviewed by Darin Adler.

Resolved name conflict with globally defined tzname in Symbian.
Replaced with different name instead of using namespace qualifier
(appeared to be less clumsy).

• runtime/DateMath.cpp:

File:

• trunk/JavaScriptCore/runtime/DateMath.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/DateMath.cpp

@@ -920 +920 @@
     } else {
         int offset = abs(gmtoffset(t));
-        char tzname[70];
+        char timeZoneName[70];
         struct tm gtm = t;
-        strftime(tzname, sizeof(tzname), "%Z", &gtm);
-
-        if (tzname[0]) {
+        strftime(timeZoneName, sizeof(timeZoneName), "%Z", &gtm);
+
+        if (timeZoneName[0]) {
             snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d GMT%c%02d%02d (%s)",
                 t.hour, t.minute, t.second,
-                gmtoffset(t) < 0 ? '-' : '+', offset / (60*60), (offset / 60) % 60, tzname);
+                gmtoffset(t) < 0 ? '-' : '+', offset / (60*60), (offset / 60) % 60, timeZoneName);
         } else {
             snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d GMT%c%02d%02d",