refactoring: inline function blobDataToBuffer, doesn't do much anymore

marook · Feb 15, 2015 · 4bb99b4 · 4bb99b4
1 parent 1548fc0
commit 4bb99b4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/lib/browser/buffer.js b/lib/browser/buffer.js
@@ -2,11 +2,6 @@ function readPBFElementFromBuffer(buffer, pbfDecode, callback){
     return callback(null, pbfDecode(buffer));
 }
 
-function blobDataToBuffer(blob){
-    return new Uint8Array(blob.toBuffer());
-}
-
 module.exports = {
-    readPBFElementFromBuffer: readPBFElementFromBuffer,
-    blobDataToBuffer: blobDataToBuffer
+    readPBFElementFromBuffer: readPBFElementFromBuffer
 };
diff --git a/lib/browser/zlib.js b/lib/browser/zlib.js
@@ -1,9 +1,8 @@
 // don't use npm 'zlibjs' module, would require shims for the Node.js wrappers
 var Zlib = require('../../node_modules/zlibjs/bin/inflate.min.js').Zlib;
-var buf = require('./buffer.js');
 
 function inflateBlob(blob, callback){
-    var infl = new Zlib.Inflate(buf.blobDataToBuffer(blob.zlib_data), {
+    var infl = new Zlib.Inflate(new Uint8Array(blob.zlib_data.toBuffer()), {
         bufferSize: blob.raw_size
     });
     return callback(null, infl.decompress());

diff --git a/lib/nodejs/buffer.js b/lib/nodejs/buffer.js
@@ -2,11 +2,6 @@ function readPBFElementFromBuffer(buffer, pbfDecode, callback){
     return callback(null, pbfDecode(buffer));
 }
 
-function blobDataToBuffer(blob){
-    return blob.toBuffer();
-}
-
 module.exports = {
-    readPBFElementFromBuffer: readPBFElementFromBuffer,
-    blobDataToBuffer: blobDataToBuffer
+    readPBFElementFromBuffer: readPBFElementFromBuffer
 };
diff --git a/lib/nodejs/zlib.js b/lib/nodejs/zlib.js
@@ -1,8 +1,7 @@
 var zlib = require('zlib');
-var buf = require('./buffer.js');
 
 function inflateBlob(blob, callback){
-    zlib.inflate(buf.blobDataToBuffer(blob.zlib_data), callback);
+    zlib.inflate(blob.zlib_data.toBuffer(), callback);
 }
 
 module.exports = {