Speed up, fix, and update the buffer_extras lib.

creationix · creationix · commit af12e7e8e164 · 2010-08-17T17:37:23.000-07:00
diff --git a/lib/buffer_extras.js b/lib/buffer_extras.js
@@ -33,49 +33,35 @@ proto.zeroOut = function zeroOut() {
 // Writes a 32 bit integer at offset
 proto.int32Write = function int32Write(number, offset) {
   offset = offset || 0;
-  var unsigned = (number < 0) ? (number + 0x100000000) : number;
-  this[offset] = Math.floor(unsigned / 0xffffff);
-  unsigned &= 0xffffff;
-  this[offset + 1] = Math.floor(unsigned / 0xffff);
-  unsigned &= 0xffff;
-  this[offset + 2] = Math.floor(unsigned / 0xff);
-  unsigned &= 0xff;
-  this[offset + 3] = Math.floor(unsigned);
+  this[offset] = number >>> 24;
+  this[offset + 1] = number >>> 16;
+  this[offset + 2] = number >>> 8;
+  this[offset + 3] = number >>> 0;
 };
 
 // Writes a 16 bit integer at offset
 proto.int16Write = function int16Write(number, offset) {
   offset = offset || 0;
-  var unsigned = (number < 0) ? (number + 0x10000) : number;
-  this[offset] = Math.floor(unsigned / 0xff);
-  unsigned &= 0xff;
-  this[offset + 1] = Math.floor(unsigned);
+  this[offset] = number >>> 8;
+  this[offset + 1] = number >>> 0;
 }
 
 // Reads a 32 bit integer from offset
 proto.int32Read = function int32Read(offset) {
   offset = offset || 0;
-  var unsigned = this[offset] * 0x1000000 + 
-                 this[offset + 1] * 0x10000 + 
-                 this[offset + 2] * 0x100 +
-                 this[offset + 3];
-  return (unsigned & 0x80000000) ? (unsigned - 0x100000000) : unsigned
+  return this[offset] * 0x1000000 +
+         this[offset + 1] << 16 +
+         this[offset + 2] << 8 +
+         this[offset + 3];
 };
 
 // Reads a 32 bit integer from offset
 proto.int16Read = function int16Read(offset) {
   offset = offset || 0;
-  var unsigned = this[offset] * 0x100 + 
-                 this[offset + 1];
-  return (unsigned & 0x8000) ? (unsigned - 0x10000) : unsigned
+  return this[offset] << 8 +
+         this[offset + 1];
 };
 
-Buffer.fromString = function fromString(string) {
-  var b = new Buffer(Buffer.byteLength(string));
-  b.write(string, 'utf8');
-  return b;
-}
-
 Buffer.makeWriter = function makeWriter() {
   var data = [];
   var writer;
@@ -93,15 +79,15 @@ Buffer.makeWriter = function makeWriter() {
       return writer;
     },
     string: function pushString(string) {
-      data.push(Buffer.fromString(string));
+      data.push(new Buffer(string, 'utf8'));
       return writer;
     },
     cstring: function pushCstring(string) {
-      data.push(Buffer.fromString(string + "\0"));
+      data.push(new Buffer(string + "\0", 'utf8'));
       return writer;
     },
     multicstring: function pushMulticstring(fields) {
-      data.push(Buffer.fromString(fields.join("\0") + "\0\0"));
+      data.push(new Buffer(fields.join("\0") + "\0\0", 'utf8'));
       return writer;
     },
     hash: function pushHash(hash) {
@@ -111,14 +97,14 @@ Buffer.makeWriter = function makeWriter() {
         var key = keys[i];
         pairs.push(key + "\0" + hash[key] + "\0");
       }
-      data.push(Buffer.fromString(pairs.join("") + "\0"));
+      data.push(new Buffer(pairs.join("") + "\0", 'utf8'));
       return writer;
     }
   };
   writer = {
     data: data,
     push: push,
-    
+
     // Convert an array of buffers into a single buffer using memcopy
     toBuffer: function toBuffer() {
       var total = 0;
@@ -192,7 +178,7 @@ proto.toReader = function toReader() {
 
 // Test It
 // var sys = require('sys');
-// 
+//
 // var w = Buffer.makeWriter();
 // w.push.int32(305419896);
 // w.push.int16(4660);
@@ -215,4 +201,4 @@ proto.toReader = function toReader() {
 //   r.int32(),
 //   r.int16()
 // ]);
-// 
+//
