[Pkg-javascript-commits] [node-leveldown] 159/492: use util._extend instead of local variant
Andrew Kelley
andrewrk-guest at moszumanska.debian.org
Sun Jul 6 17:13:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
andrewrk-guest pushed a commit to annotated tag rocksdb-0.10.1
in repository node-leveldown.
commit 92e6e10e2baee60d14977d165fafc2316e76a0ad
Author: Rod Vagg <rod at vagg.org>
Date: Wed Jan 9 12:42:56 2013 +1100
use util._extend instead of local variant
---
lib/levelup.js | 2 +-
lib/read-stream.js | 2 +-
lib/util.js | 6 ------
lib/write-stream.js | 2 +-
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/lib/levelup.js b/lib/levelup.js
index 0fb6213..876dcbd 100644
--- a/lib/levelup.js
+++ b/lib/levelup.js
@@ -10,9 +10,9 @@ var bridge = require('bindings')('levelup.node')
, errors = require('./errors')
, readStream = require('./read-stream')
, writeStream = require('./write-stream')
+ , extend = require('util')._extend
, toEncoding = require('./util').toEncoding
, toSlice = require('./util').toSlice
- , extend = require('./util').extend
, encodings = require('./util').encodings
, defaultOptions = {
diff --git a/lib/read-stream.js b/lib/read-stream.js
index 2257ce6..50fb8b6 100644
--- a/lib/read-stream.js
+++ b/lib/read-stream.js
@@ -6,10 +6,10 @@
var Stream = require('stream').Stream
, BufferStream = require('bufferstream')
, inherits = require('util').inherits
+ , extend = require('util')._extend
, toEncoding = require('./util').toEncoding
, toSlice = require('./util').toSlice
- , extend = require('./util').extend
, setImmediate = require('./util').setImmediate
, defaultOptions = { keys: true, values: true }
diff --git a/lib/util.js b/lib/util.js
index 6097dc1..d5aa854 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -32,11 +32,6 @@ var encodings = 'hex utf8 utf-8 ascii binary base64 ucs2 ucs-2 utf16le utf-16le'
return encoders
}())
- , extend = function (dst, src) {
- for (var p in src) dst[p] = src[p]
- return dst
- }
-
, copy = function (srcdb, dstdb, callback) {
srcdb.readStream()
.pipe(dstdb.writeStream({useBatch:false}))
@@ -50,7 +45,6 @@ module.exports = {
encodings : encodings
, toSlice : toSlice
, toEncoding : toEncoding
- , extend : extend
, copy : copy
, setImmediate : setImmediate
}
\ No newline at end of file
diff --git a/lib/write-stream.js b/lib/write-stream.js
index a588815..63106b2 100644
--- a/lib/write-stream.js
+++ b/lib/write-stream.js
@@ -5,9 +5,9 @@
var Stream = require('stream').Stream
, inherits = require('util').inherits
+ , extend = require('util')._extend
, concatStream = require('concat-stream')
- , extend = require('./util').extend
, setImmediate = require('./util').setImmediate
, defaultOptions = {}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-leveldown.git
More information about the Pkg-javascript-commits
mailing list