Minor polish to the last few commits; no change in functionality.

1 files changed, 45 insertions, 45 deletions

diff --git a/src/library.js b/src/library.js
index ffd10c3f..18d60221 100644
--- a/src/library.js
+++ b/src/library.js
@@ -1629,7 +1629,7 @@ var Library = {
       // TODO: Set errno.
     }
     for (var i = 0; i < path.length; i++) {
-      {{{ makeSetValue('buf+i', 0, 'path[i].charCodeAt(0)', 'i32') }}}
+      {{{ makeSetValue('buf', 'i', 'path[i].charCodeAt(0)', 'i8') }}}
     }
     return buf;
   },
@@ -1732,23 +1732,23 @@ var Library = {
   __tm_current: 0,
   // Statically allocated timezone strings.
   __tm_timezones: {},
-  // Statically allocated time string strings.
+  // Statically allocated time strings.
   __tm_formatted: 0,
 
   mktime__deps: ['__tm_struct_layout', 'tzset'],
-  mktime: function(tm_ptr) {
+  mktime: function(tmPtr) {
     _tzset();
-    var year = {{{ makeGetValue('tm_ptr', '___tm_struct_layout.tm_year', 'i32') }}};
+    var year = {{{ makeGetValue('tmPtr', '___tm_struct_layout.tm_year', 'i32') }}};
     var timestamp = new Date(year >= 1900 ? year : year + 1900,
-                             {{{ makeGetValue('tm_ptr', '___tm_struct_layout.tm_mon', 'i32') }}},
-                             {{{ makeGetValue('tm_ptr', '___tm_struct_layout.tm_mday', 'i32') }}},
-                             {{{ makeGetValue('tm_ptr', '___tm_struct_layout.tm_hour', 'i32') }}},
-                             {{{ makeGetValue('tm_ptr', '___tm_struct_layout.tm_min', 'i32') }}},
-                             {{{ makeGetValue('tm_ptr', '___tm_struct_layout.tm_sec', 'i32') }}},
+                             {{{ makeGetValue('tmPtr', '___tm_struct_layout.tm_mon', 'i32') }}},
+                             {{{ makeGetValue('tmPtr', '___tm_struct_layout.tm_mday', 'i32') }}},
+                             {{{ makeGetValue('tmPtr', '___tm_struct_layout.tm_hour', 'i32') }}},
+                             {{{ makeGetValue('tmPtr', '___tm_struct_layout.tm_min', 'i32') }}},
+                             {{{ makeGetValue('tmPtr', '___tm_struct_layout.tm_sec', 'i32') }}},
                              0).getTime() / 1000;
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_wday', 'new Date(timestamp).getDay()', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_wday', 'new Date(timestamp).getDay()', 'i32') }}}
     var yday = Math.round((timestamp - (new Date(year, 0, 1)).getTime()) / (1000 * 60 * 60 * 24));
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_yday', 'yday', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_yday', 'yday', 'i32') }}}
     return timestamp;
   },
   timelocal: 'mktime',
@@ -1760,38 +1760,38 @@ var Library = {
   },
 
   gmtime_r__deps: ['__tm_struct_layout', '__tm_timezones'],
-  gmtime_r: function(time, tm_ptr) {
+  gmtime_r: function(time, tmPtr) {
     var date = new Date({{{ makeGetValue('time', 0, 'i32') }}}*1000);
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_sec', 'date.getUTCSeconds()', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_min', 'date.getUTCMinutes()', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_hour', 'date.getUTCHours()', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_mday', 'date.getUTCDate()', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_mon', 'date.getUTCMonth()', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_year', 'date.getUTCFullYear()-1900', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_wday', 'date.getUTCDay()', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_gmtoff', '0', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_isdst', '0', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_sec', 'date.getUTCSeconds()', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_min', 'date.getUTCMinutes()', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_hour', 'date.getUTCHours()', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_mday', 'date.getUTCDate()', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_mon', 'date.getUTCMonth()', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_year', 'date.getUTCFullYear()-1900', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_wday', 'date.getUTCDay()', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_gmtoff', '0', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_isdst', '0', 'i32') }}}
 
     var start = new Date(date.getFullYear(), 0, 1);
     var yday = Math.round((date.getTime() - start.getTime()) / (1000 * 60 * 60 * 24));
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_yday', 'yday', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_yday', 'yday', 'i32') }}}
 
     var timezone = "GMT";
     if (!(timezone in ___tm_timezones)) {
       ___tm_timezones[timezone] = Pointer_make(intArrayFromString(timezone), null, ALLOC_NORMAL, 'i8');
     }
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_zone', '___tm_timezones[timezone]', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_zone', '___tm_timezones[timezone]', 'i32') }}}
 
-    return tm_ptr;
+    return tmPtr;
   },
 
   timegm__deps: ['__tm_struct_layout', 'mktime'],
-  timegm: function(tm_ptr) {
+  timegm: function(tmPtr) {
     _tzset();
     var offset = {{{ makeGetValue('_timezone', 0, 'i32') }}};
     var daylight = {{{ makeGetValue('_daylight', 0, 'i32') }}};
     daylight = (daylight == 1) ? 60 * 60 : 0;
-    var ret = _mktime(tm_ptr) - (offset + daylight);
+    var ret = _mktime(tmPtr) - (offset + daylight);
     return ret;
   },
 
@@ -1802,43 +1802,43 @@ var Library = {
   },
 
   localtime_r__deps: ['__tm_struct_layout', '__tm_timezones', 'tzset'],
-  localtime_r: function(time, tm_ptr) {
+  localtime_r: function(time, tmPtr) {
     _tzset();
     var date = new Date({{{ makeGetValue('time', 0, 'i32') }}}*1000);
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_sec', 'date.getSeconds()', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_min', 'date.getMinutes()', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_hour', 'date.getHours()', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_mday', 'date.getDate()', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_mon', 'date.getMonth()', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_year', 'date.getFullYear()-1900', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_wday', 'date.getDay()', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_sec', 'date.getSeconds()', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_min', 'date.getMinutes()', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_hour', 'date.getHours()', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_mday', 'date.getDate()', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_mon', 'date.getMonth()', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_year', 'date.getFullYear()-1900', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_wday', 'date.getDay()', 'i32') }}}
 
     var start = new Date(date.getFullYear(), 0, 1);
     var yday = Math.floor((date.getTime() - start.getTime()) / (1000 * 60 * 60 * 24));
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_yday', 'yday', 'i32') }}}
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_gmtoff', '-start.getTimezoneOffset() * 60', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_yday', 'yday', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_gmtoff', '-start.getTimezoneOffset() * 60', 'i32') }}}
 
     var dst = Number(start.getTimezoneOffset() != date.getTimezoneOffset());
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_isdst', 'dst', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_isdst', 'dst', 'i32') }}}
 
     var timezone = date.toString().match(/\(([A-Z]+)\)/)[1];
     if (!(timezone in ___tm_timezones)) {
       ___tm_timezones[timezone] = Pointer_make(intArrayFromString(timezone), null, ALLOC_NORMAL, 'i8');
     }
-    {{{ makeSetValue('tm_ptr', '___tm_struct_layout.tm_zone', '___tm_timezones[timezone]', 'i32') }}}
+    {{{ makeSetValue('tmPtr', '___tm_struct_layout.tm_zone', '___tm_timezones[timezone]', 'i32') }}}
 
-    return tm_ptr;
+    return tmPtr;
   },
 
   asctime__deps: ['malloc', '__tm_formatted', 'asctime_r'],
-  asctime: function(tm_ptr) {
+  asctime: function(tmPtr) {
     if (!___tm_formatted) ___tm_formatted = _malloc(26);
-    return _asctime_r(tm_ptr, ___tm_formatted);
+    return _asctime_r(tmPtr, ___tm_formatted);
   },
 
   asctime_r__deps: ['__tm_formatted', 'mktime'],
-  asctime_r: function(tm_ptr, buf) {
-    var date = new Date(_mktime(tm_ptr)*1000);
+  asctime_r: function(tmPtr, buf) {
+    var date = new Date(_mktime(tmPtr)*1000);
     var formatted = date.toString();
     var datePart = formatted.replace(/\d{4}.*/, '').replace(/ 0/, '  ');
     var timePart = formatted.match(/\d{2}:\d{2}:\d{2}/)[0];
@@ -1865,13 +1865,13 @@ var Library = {
     return leap ? 366 : 365;
   },
 
-  // TODO: Initialize these to defaults on startup.
+  // TODO: Initialize these to defaults on startup from system settings.
   tzname: null,
   daylight: null,
   timezone: null,
   tzset__deps: ['malloc', 'tzname', 'daylight', 'timezone'],
   tzset: function() {
-    // TODO: Use (malleable) environment variables instead.
+    // TODO: Use (malleable) environment variables instead of system settings.
     if (_tzname !== null) return;
 
     _timezone = _malloc(QUANTUM_SIZE);