Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nspr/pr/src/misc/prtime.c

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * prtime.c --
  *
  *     NSPR date and time functions
  *
@@ skipping 1654 matching lines @@
  *-----------------------------------------------------------------------
  *
  * PR_FormatTime --
  *
  *     Format a time value into a buffer. Same semantics as strftime().
  *
  *-----------------------------------------------------------------------
  */
 
 PR_IMPLEMENT(PRUint32)
-PR_FormatTime(char *buf, int buflen, const char *fmt, const PRExplodedTime *tm)
+PR_FormatTime(char *buf, int buflen, const char *fmt,
+              const PRExplodedTime *time)
 {
     size_t rv;
     struct tm a;
     struct tm *ap;
 
-    if (tm) {
+    if (time) {
         ap = &a;
-        a.tm_sec = tm->tm_sec;
-        a.tm_min = tm->tm_min;
-        a.tm_hour = tm->tm_hour;
-        a.tm_mday = tm->tm_mday;
-        a.tm_mon = tm->tm_month;
-        a.tm_wday = tm->tm_wday;
-        a.tm_year = tm->tm_year - 1900;
-        a.tm_yday = tm->tm_yday;
-        a.tm_isdst = tm->tm_params.tp_dst_offset ? 1 : 0;
+        a.tm_sec = time->tm_sec;
+        a.tm_min = time->tm_min;
+        a.tm_hour = time->tm_hour;
+        a.tm_mday = time->tm_mday;
+        a.tm_mon = time->tm_month;
+        a.tm_wday = time->tm_wday;
+        a.tm_year = time->tm_year - 1900;
+        a.tm_yday = time->tm_yday;
+        a.tm_isdst = time->tm_params.tp_dst_offset ? 1 : 0;
 
         /*
          * On some platforms, for example SunOS 4, struct tm has two
          * additional fields: tm_zone and tm_gmtoff.
          */
 
 #if (__GLIBC__ >= 2) || defined(XP_BEOS) \
         || defined(NETBSD) || defined(OPENBSD) || defined(FREEBSD) \
         || defined(DARWIN) || defined(SYMBIAN) || defined(ANDROID)
         a.tm_zone = NULL;
-        a.tm_gmtoff = tm->tm_params.tp_gmt_offset +
-                      tm->tm_params.tp_dst_offset;
+        a.tm_gmtoff = time->tm_params.tp_gmt_offset +
+                      time->tm_params.tp_dst_offset;
 #endif
     } else {
         ap = NULL;
     }
 
     rv = strftime(buf, buflen, fmt, ap);
     if (!rv && buf && buflen > 0) {
         /*
          * When strftime fails, the contents of buf are indeterminate.
          * Some callers don't check the return value from this function,
@@ skipping 288 matching lines @@
      /* Count the number of full weeks ( dayOfYear / 7 ) then add a week if there
       * are any days left over ( dayOfYear % 7 ).  Because we are only counting to
       * the first day of the week containing the given time, rather than to the
       * actual day representing the given time, any days in week 0 will be "absorbed"
       * as extra days in the given week.
       */
      return (dayOfYear / 7) + ( (dayOfYear % 7) == 0 ? 0 : 1 );
   }
 }