remove useless bitwise comparison

mariadb-corporation · Mar 21, 2018 · 3e7aa33 · 3e7aa33
1 parent 6a043ed
commit 3e7aa33
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/benchmarks/benchmarkOne.js b/benchmarks/benchmarkOne.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var fs = require("fs");
 var Bench = require("./common_benchmarks");
 var bench;

diff --git a/benchmarks/benchmarks.js b/benchmarks/benchmarks.js
@@ -1,3 +1,5 @@
+"use strict";
+
 const fs = require("fs");
 const Bench = require("./common_benchmarks");
 let bench;

diff --git a/benchmarks/common_benchmarks.js b/benchmarks/common_benchmarks.js
@@ -1,4 +1,5 @@
-const Benchmark = require("benchmark");
+"use strict";
+
 const conf = require("../test/conf");
 
 const colors = require("colors");

diff --git a/src/io/Packet.js b/src/io/Packet.js
@@ -32,25 +32,27 @@ class Packet {
   }
 
   readUInt16() {
-    return this.buf[this.off++] | (this.buf[this.off++] << 8);
+    return this.buf[this.off++] + (this.buf[this.off++] << 8);
   }
 
   readUInt24() {
-    return this.buf[this.off++] | (this.buf[this.off++] << 8) | (this.buf[this.off++] << 16);
+    return this.buf[this.off++] + (this.buf[this.off++] << 8) + (this.buf[this.off++] << 16);
   }
 
   readUInt32() {
     return (
-      (this.buf[this.off++] | (this.buf[this.off++] << 8) | (this.buf[this.off++] << 16)) +
+      this.buf[this.off++] +
+      (this.buf[this.off++] << 8) +
+      (this.buf[this.off++] << 16) +
       this.buf[this.off++] * 0x1000000
     );
   }
 
   readInt32() {
     return (
-      this.buf[this.off++] |
-      (this.buf[this.off++] << 8) |
-      (this.buf[this.off++] << 16) |
+      this.buf[this.off++] +
+      (this.buf[this.off++] << 8) +
+      (this.buf[this.off++] << 16) +
       (this.buf[this.off++] << 24)
     );
   }
@@ -117,7 +119,7 @@ class Packet {
   }
 
   readSignedLength() {
-    const type = this.readUInt8();
+    const type = this.buf[this.off++];
     switch (type) {
       case 0xfb:
         return null;
@@ -133,7 +135,7 @@ class Packet {
   }
 
   readUnsignedLength() {
-    const type = this.readUInt8();
+    const type = this.buf[this.off++];
     switch (type) {
       case 0xfb:
         return null;