From fb8811d95ec3d644f60db24f4a816f8c05cd9ad5 Mon Sep 17 00:00:00 2001 From: Roman Reiss Date: Sat, 13 Jun 2015 19:47:14 +0200 Subject: [PATCH] lib,test: fix whitespace issues PR-URL: https://github.com/nodejs/io.js/pull/1971 Reviewed-By: Ben Noordhuis --- lib/_debugger.js | 4 ---- lib/_http_server.js | 1 - lib/_stream_readable.js | 3 --- lib/crypto.js | 3 --- lib/fs.js | 4 ---- lib/net.js | 1 - lib/readline.js | 1 - lib/stream.js | 1 - lib/tty.js | 1 - lib/zlib.js | 2 -- test/internet/test-net-connect-timeout.js | 3 --- test/parallel/test-buffer-inspect.js | 2 +- test/parallel/test-buffer.js | 1 - test/parallel/test-child-process-double-pipe.js | 3 --- test/parallel/test-child-process-exit-code.js | 1 - test/parallel/test-domain.js | 9 --------- test/parallel/test-event-emitter-num-args.js | 2 -- test/parallel/test-fs-read-stream-resume.js | 2 +- test/parallel/test-http-expect-continue.js | 1 - test/parallel/test-https-strict.js | 1 - test/parallel/test-module-nodemodulepaths.js | 2 +- test/parallel/test-require-dot.js | 2 +- test/parallel/test-require-extensions-main.js | 2 +- test/parallel/test-smalloc.js | 1 - test/parallel/test-stream-unshift-empty-chunk.js | 2 +- test/parallel/test-stream2-readable-from-list.js | 1 - test/parallel/test-stringbytes-external.js | 1 - test/parallel/test-url.js | 1 - test/parallel/test-vm-new-script-new-context.js | 3 --- test/parallel/test-zlib-random-byte-pipes.js | 3 --- test/parallel/test-zlib.js | 1 - test/pummel/test-exec.js | 3 --- test/pummel/test-net-throttle.js | 1 - test/pummel/test-regress-GH-814.js | 5 ----- test/pummel/test-regress-GH-814_2.js | 2 -- test/pummel/test-stream2-basic.js | 1 - test/sequential/test-pipe.js | 1 - test/sequential/test-regress-GH-3542.js | 2 +- test/sequential/test-regress-GH-4948.js | 2 +- test/sequential/test-regress-GH-784.js | 5 ----- 40 files changed, 8 insertions(+), 79 deletions(-) diff --git a/lib/_debugger.js b/lib/_debugger.js index 831cc08cd6..ed71c668f3 100644 --- a/lib/_debugger.js +++ b/lib/_debugger.js @@ -641,10 +641,6 @@ Client.prototype.fullTrace = function(cb) { }; - - - - const commands = [ [ 'run (r)', diff --git a/lib/_http_server.js b/lib/_http_server.js index 2d503f8098..b696b9bc0c 100644 --- a/lib/_http_server.js +++ b/lib/_http_server.js @@ -98,7 +98,6 @@ ServerResponse.prototype._finish = function() { }; - exports.ServerResponse = ServerResponse; ServerResponse.prototype.statusCode = 200; diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js index 709a445879..7be7723e52 100644 --- a/lib/_stream_readable.js +++ b/lib/_stream_readable.js @@ -167,7 +167,6 @@ function readableAddChunk(stream, state, chunk, encoding, addToFront) { } - // if it's past the high water mark, we can push in some more. // Also, if we have no data yet, we can stand some // more bytes. This is to work around cases where hwm=0, @@ -547,7 +546,6 @@ Readable.prototype.pipe = function(dest, pipeOpts) { dest._events.error = [onerror, dest._events.error]; - // Both close and finish should trigger unpipe, but only once. function onclose() { dest.removeListener('finish', onfinish); @@ -800,7 +798,6 @@ Readable.prototype.wrap = function(stream) { }; - // exposed for testing purposes only. Readable._fromList = fromList; diff --git a/lib/crypto.js b/lib/crypto.js index 510e8bfbdb..6306eee05f 100644 --- a/lib/crypto.js +++ b/lib/crypto.js @@ -280,7 +280,6 @@ Decipheriv.prototype.setAuthTag = Cipher.prototype.setAuthTag; Decipheriv.prototype.setAAD = Cipher.prototype.setAAD; - exports.createSign = exports.Sign = Sign; function Sign(algorithm, options) { if (!(this instanceof Sign)) @@ -316,7 +315,6 @@ Sign.prototype.sign = function(options, encoding) { }; - exports.createVerify = exports.Verify = Verify; function Verify(algorithm, options) { if (!(this instanceof Verify)) @@ -562,7 +560,6 @@ ECDH.prototype.getPublicKey = function getPublicKey(encoding, format) { }; - exports.pbkdf2 = function(password, salt, iterations, diff --git a/lib/fs.js b/lib/fs.js index 12a3ff0ffe..58704e5297 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -1596,7 +1596,6 @@ fs.realpath = function realpath(p, cache, cb) { }; - var pool; function allocNewPool(poolSize) { @@ -1605,7 +1604,6 @@ function allocNewPool(poolSize) { } - fs.createReadStream = function(path, options) { return new ReadStream(path, options); }; @@ -1778,8 +1776,6 @@ ReadStream.prototype.close = function(cb) { }; - - fs.createWriteStream = function(path, options) { return new WriteStream(path, options); }; diff --git a/lib/net.js b/lib/net.js index c5e1997252..d4a40fe07a 100644 --- a/lib/net.js +++ b/lib/net.js @@ -1004,7 +1004,6 @@ Socket.prototype.unref = function() { }; - function afterConnect(status, handle, req, readable, writable) { var self = handle.owner; diff --git a/lib/readline.js b/lib/readline.js index 7a5758a5a1..b984aac834 100644 --- a/lib/readline.js +++ b/lib/readline.js @@ -889,7 +889,6 @@ Interface.prototype._ttyWrite = function(s, key) { exports.Interface = Interface; - /** * accepts a readable Stream instance and makes it emit "keypress" events */ diff --git a/lib/stream.js b/lib/stream.js index dd381d9737..8d3535dc4d 100644 --- a/lib/stream.js +++ b/lib/stream.js @@ -16,7 +16,6 @@ Stream.PassThrough = require('_stream_passthrough'); Stream.Stream = Stream; - // old-style streams. Note that the pipe method (the only relevant // part of this class) is overridden in the Readable class. diff --git a/lib/tty.js b/lib/tty.js index 1241d52535..acab1b5735 100644 --- a/lib/tty.js +++ b/lib/tty.js @@ -49,7 +49,6 @@ ReadStream.prototype.setRawMode = function(flag) { }; - function WriteStream(fd) { if (!(this instanceof WriteStream)) return new WriteStream(fd); net.Socket.call(this, { diff --git a/lib/zlib.js b/lib/zlib.js index ebb0377912..2d37b72a3c 100644 --- a/lib/zlib.js +++ b/lib/zlib.js @@ -241,7 +241,6 @@ function Inflate(opts) { } - // gzip - bigger header, same deflate compression function Gzip(opts) { if (!(this instanceof Gzip)) return new Gzip(opts); @@ -254,7 +253,6 @@ function Gunzip(opts) { } - // raw - no header function DeflateRaw(opts) { if (!(this instanceof DeflateRaw)) return new DeflateRaw(opts); diff --git a/test/internet/test-net-connect-timeout.js b/test/internet/test-net-connect-timeout.js index d122229397..60c2837485 100644 --- a/test/internet/test-net-connect-timeout.js +++ b/test/internet/test-net-connect-timeout.js @@ -62,9 +62,6 @@ socket1.on('connect', function() { }); - - - process.on('exit', function() { assert.ok(gotTimeout0); assert.ok(!gotConnect0); diff --git a/test/parallel/test-buffer-inspect.js b/test/parallel/test-buffer-inspect.js index 707f778255..35da378631 100644 --- a/test/parallel/test-buffer-inspect.js +++ b/test/parallel/test-buffer-inspect.js @@ -35,4 +35,4 @@ buffer.INSPECT_MAX_BYTES = Infinity; assert.doesNotThrow(function() { assert.strictEqual(util.inspect(b), expected); assert.strictEqual(util.inspect(s), expected); -}); \ No newline at end of file +}); diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js index d5af93a1de..502dcf43a7 100644 --- a/test/parallel/test-buffer.js +++ b/test/parallel/test-buffer.js @@ -314,7 +314,6 @@ assert.equal(b, c.parent); assert.equal(b, d.parent); - // Bug regression test var testValue = '\u00F6\u65E5\u672C\u8A9E'; // ö日本語 var buffer = new Buffer(32); diff --git a/test/parallel/test-child-process-double-pipe.js b/test/parallel/test-child-process-double-pipe.js index 17b0579131..41f49bb7a8 100644 --- a/test/parallel/test-child-process-double-pipe.js +++ b/test/parallel/test-child-process-double-pipe.js @@ -35,7 +35,6 @@ if (is_windows) { */ - // pipe echo | grep echo.stdout.on('data', function(data) { console.error('grep stdin write ' + data.length); @@ -66,7 +65,6 @@ sed.on('exit', function() { }); - // pipe grep | sed grep.stdout.on('data', function(data) { console.error('grep stdout ' + data.length); @@ -86,7 +84,6 @@ grep.stdout.on('end', function(code) { }); - var result = ''; // print sed's output diff --git a/test/parallel/test-child-process-exit-code.js b/test/parallel/test-child-process-exit-code.js index feb2fe2175..0ccbb46a91 100644 --- a/test/parallel/test-child-process-exit-code.js +++ b/test/parallel/test-child-process-exit-code.js @@ -16,7 +16,6 @@ exitChild.on('exit', function(code, signal) { }); - var errorScript = path.join(common.fixturesDir, 'child_process_should_emit_error.js'); var errorChild = spawn(process.argv[0], [errorScript]); diff --git a/test/parallel/test-domain.js b/test/parallel/test-domain.js index 9cca05178e..cca0157212 100644 --- a/test/parallel/test-domain.js +++ b/test/parallel/test-domain.js @@ -105,7 +105,6 @@ d.on('error', function(er) { }); - process.on('exit', function() { console.error('exit', caught, expectCaught); assert.equal(caught, expectCaught, 'caught the expected number of errors'); @@ -113,7 +112,6 @@ process.on('exit', function() { }); - // revert to using the domain when a callback is passed to nextTick in // the middle of a tickCallback loop d.run(function() { @@ -124,7 +122,6 @@ d.run(function() { expectCaught++; - // catch thrown errors no matter how many times we enter the event loop // this only uses implicit binding, except for the first function // passed to d.run(). The rest are implicitly bound by virtue of being @@ -146,7 +143,6 @@ d.run(function() { expectCaught++; - // implicit addition of a timer created within a domain-bound context. d.run(function() { setTimeout(function() { @@ -156,14 +152,12 @@ d.run(function() { expectCaught++; - // Event emitters added to the domain have their errors routed. d.add(e); e.emit('error', new Error('emitted')); expectCaught++; - // get rid of the `if (er) return cb(er)` malarky, by intercepting // the cb functions to the domain, and using the intercepted function // as a callback instead. @@ -177,7 +171,6 @@ bound(new Error('bound')); expectCaught++; - // intercepted should never pass first argument to callback function fn2(data) { assert.equal(data, 'data', 'should not be null err argument'); @@ -208,7 +201,6 @@ setTimeout(d.bind(thrower), 100); expectCaught++; - // Pass an intercepted function to an fs operation that fails. fs.open('this file does not exist', 'r', d.intercept(function(er) { console.error('should not get here!', er); @@ -217,7 +209,6 @@ fs.open('this file does not exist', 'r', d.intercept(function(er) { expectCaught++; - // implicit addition by being created within a domain-bound context. var implicit; diff --git a/test/parallel/test-event-emitter-num-args.js b/test/parallel/test-event-emitter-num-args.js index 522fb2e217..6c403cd2f2 100644 --- a/test/parallel/test-event-emitter-num-args.js +++ b/test/parallel/test-event-emitter-num-args.js @@ -24,5 +24,3 @@ e.emit('numArgs', null, null, null, null, null); process.on('exit', function() { assert.deepEqual([0, 1, 2, 3, 4, 5], num_args_emited); }); - - diff --git a/test/parallel/test-fs-read-stream-resume.js b/test/parallel/test-fs-read-stream-resume.js index 9a2e2ee76f..abac0686c1 100644 --- a/test/parallel/test-fs-read-stream-resume.js +++ b/test/parallel/test-fs-read-stream-resume.js @@ -18,7 +18,7 @@ stream.on('data', function(chunk) { stream.resume(); } }); - + process.nextTick(function() { stream.pause(); setTimeout(function() { diff --git a/test/parallel/test-http-expect-continue.js b/test/parallel/test-http-expect-continue.js index aef4a98d84..1a1418a41c 100644 --- a/test/parallel/test-http-expect-continue.js +++ b/test/parallel/test-http-expect-continue.js @@ -31,7 +31,6 @@ server.on('checkContinue', function(req, res) { server.listen(common.PORT); - server.on('listening', function() { var req = http.request({ port: common.PORT, diff --git a/test/parallel/test-https-strict.js b/test/parallel/test-https-strict.js index 7ab5c3ee82..46d65ae393 100644 --- a/test/parallel/test-https-strict.js +++ b/test/parallel/test-https-strict.js @@ -79,7 +79,6 @@ var responseCount = 0; var pending = 0; - function server(options, port) { var s = https.createServer(options, handler); s.requests = []; diff --git a/test/parallel/test-module-nodemodulepaths.js b/test/parallel/test-module-nodemodulepaths.js index b1f04d41d0..a1a70309b5 100644 --- a/test/parallel/test-module-nodemodulepaths.js +++ b/test/parallel/test-module-nodemodulepaths.js @@ -19,4 +19,4 @@ if (isWindows) { paths = module._nodeModulePaths(file); assert.ok(paths.indexOf(file + delimiter + 'node_modules') !== -1); -assert.ok(Array.isArray(paths)); \ No newline at end of file +assert.ok(Array.isArray(paths)); diff --git a/test/parallel/test-require-dot.js b/test/parallel/test-require-dot.js index aab466e3eb..2fb161486a 100644 --- a/test/parallel/test-require-dot.js +++ b/test/parallel/test-require-dot.js @@ -14,4 +14,4 @@ module._initPaths(); var c = require('.'); -assert.equal(c.value, 42, 'require(".") should honor NODE_PATH'); \ No newline at end of file +assert.equal(c.value, 42, 'require(".") should honor NODE_PATH'); diff --git a/test/parallel/test-require-extensions-main.js b/test/parallel/test-require-extensions-main.js index 6e67d3ae04..198fa6a8c5 100644 --- a/test/parallel/test-require-extensions-main.js +++ b/test/parallel/test-require-extensions-main.js @@ -2,4 +2,4 @@ var common = require('../common'); var assert = require('assert'); -require(common.fixturesDir + '/require-bin/bin/req.js'); \ No newline at end of file +require(common.fixturesDir + '/require-bin/bin/req.js'); diff --git a/test/parallel/test-smalloc.js b/test/parallel/test-smalloc.js index ce4e4f43cd..68d2c23fa4 100644 --- a/test/parallel/test-smalloc.js +++ b/test/parallel/test-smalloc.js @@ -155,7 +155,6 @@ assert.equal(b[0], 0xff); assert.equal(b[1], 0xff); - // verify checking external if has external memory // check objects diff --git a/test/parallel/test-stream-unshift-empty-chunk.js b/test/parallel/test-stream-unshift-empty-chunk.js index e6c4272212..a7dcad4253 100644 --- a/test/parallel/test-stream-unshift-empty-chunk.js +++ b/test/parallel/test-stream-unshift-empty-chunk.js @@ -2,7 +2,7 @@ var common = require('../common'); var assert = require('assert'); -// This test verifies that stream.unshift(Buffer(0)) or +// This test verifies that stream.unshift(Buffer(0)) or // stream.unshift('') does not set state.reading=false. var Readable = require('stream').Readable; diff --git a/test/parallel/test-stream2-readable-from-list.js b/test/parallel/test-stream2-readable-from-list.js index f142c49f14..a8d9fb38f2 100644 --- a/test/parallel/test-stream2-readable-from-list.js +++ b/test/parallel/test-stream2-readable-from-list.js @@ -38,7 +38,6 @@ process.on('exit', function() { process.nextTick(run); - test('buffers', function(t) { // have a length var len = 16; diff --git a/test/parallel/test-stringbytes-external.js b/test/parallel/test-stringbytes-external.js index 4453580bd9..107685ba8f 100644 --- a/test/parallel/test-stringbytes-external.js +++ b/test/parallel/test-stringbytes-external.js @@ -49,7 +49,6 @@ assert.equal(c_bin.toString('binary'), ucs2_control); assert.equal(c_ucs.toString('binary'), ucs2_control); - // now let's test BASE64 and HEX ecoding/decoding var RADIOS = 2; var PRE_HALF_APEX = Math.ceil(EXTERN_APEX / 2) - RADIOS; diff --git a/test/parallel/test-url.js b/test/parallel/test-url.js index 4e3251a9da..a6eeca1da8 100644 --- a/test/parallel/test-url.js +++ b/test/parallel/test-url.js @@ -1562,7 +1562,6 @@ relativeTests2.forEach(function(relativeTest) { }); - // https://github.com/nodejs/io.js/pull/1036 var throws = [ undefined, diff --git a/test/parallel/test-vm-new-script-new-context.js b/test/parallel/test-vm-new-script-new-context.js index 4619c9345c..e3cc6e91cb 100644 --- a/test/parallel/test-vm-new-script-new-context.js +++ b/test/parallel/test-vm-new-script-new-context.js @@ -20,7 +20,6 @@ assert.throws(function() { }, /test/); - console.error('undefined reference'); var error; script = new Script('foo.bar = 5;'); @@ -67,5 +66,3 @@ console.error('invalid this'); assert.throws(function() { script.runInNewContext.call('\'hello\';'); }, TypeError); - - diff --git a/test/parallel/test-zlib-random-byte-pipes.js b/test/parallel/test-zlib-random-byte-pipes.js index fcdc81443c..0f34f7ac4f 100644 --- a/test/parallel/test-zlib-random-byte-pipes.js +++ b/test/parallel/test-zlib-random-byte-pipes.js @@ -14,7 +14,6 @@ var util = require('util'); var zlib = require('zlib'); - // emit random bytes, and keep a shasum function RandomReadStream(opt) { Stream.call(this); @@ -130,8 +129,6 @@ HashStream.prototype.end = function(c) { }; - - var inp = new RandomReadStream({ total: 1024, block: 256, jitter: 16 }); var out = new HashStream(); var gzip = zlib.createGzip(); diff --git a/test/parallel/test-zlib.js b/test/parallel/test-zlib.js index aaa965c424..b3f193d0a6 100644 --- a/test/parallel/test-zlib.js +++ b/test/parallel/test-zlib.js @@ -133,7 +133,6 @@ SlowStream.prototype.end = function(chunk) { }; - // for each of the files, make sure that compressing and // decompressing results in the same data, for every combination // of the options set above. diff --git a/test/pummel/test-exec.js b/test/pummel/test-exec.js index 41d81426e6..4013e2107b 100644 --- a/test/pummel/test-exec.js +++ b/test/pummel/test-exec.js @@ -50,7 +50,6 @@ exec('thisisnotavalidcommand', function(err, stdout, stderr) { }); - var sleeperStart = new Date(); exec(SLEEP3_COMMAND, { timeout: 50 }, function(err, stdout, stderr) { var diff = (new Date()) - sleeperStart; @@ -62,8 +61,6 @@ exec(SLEEP3_COMMAND, { timeout: 50 }, function(err, stdout, stderr) { }); - - var startSleep3 = new Date(); var killMeTwice = exec(SLEEP3_COMMAND, {timeout: 1000}, killMeTwiceCallback); diff --git a/test/pummel/test-net-throttle.js b/test/pummel/test-net-throttle.js index d556d8aaa8..54956b789a 100644 --- a/test/pummel/test-net-throttle.js +++ b/test/pummel/test-net-throttle.js @@ -55,7 +55,6 @@ server.listen(common.PORT, function() { }); - process.on('exit', function() { assert.equal(N, chars_recved); assert.equal(true, npauses > 2); diff --git a/test/pummel/test-regress-GH-814.js b/test/pummel/test-regress-GH-814.js index 0059af1037..4ed4b31ae2 100644 --- a/test/pummel/test-regress-GH-814.js +++ b/test/pummel/test-regress-GH-814.js @@ -19,14 +19,12 @@ var testFileFD = fs.openSync(testFileName, 'w'); console.log(testFileName); - var kBufSize = 128 * 1024; var PASS = true; var neverWrittenBuffer = newBuffer(kBufSize, 0x2e); //0x2e === '.' var bufPool = []; - var tail = require('child_process').spawn('tail', ['-f', testFileName]); tail.stdout.on('data', tailCB); @@ -35,7 +33,6 @@ function tailCB(data) { } - var timeToQuit = Date.now() + 8e3; //Test during no more than this seconds. (function main() { @@ -68,5 +65,3 @@ function cb(err, written) { throw err; } } - - diff --git a/test/pummel/test-regress-GH-814_2.js b/test/pummel/test-regress-GH-814_2.js index 6dd2f2d32e..9de1a2c3f3 100644 --- a/test/pummel/test-regress-GH-814_2.js +++ b/test/pummel/test-regress-GH-814_2.js @@ -70,8 +70,6 @@ function writerCB(err, written) { } - - // ******************* UTILITIES diff --git a/test/pummel/test-stream2-basic.js b/test/pummel/test-stream2-basic.js index c83d80c502..fe921dc005 100644 --- a/test/pummel/test-stream2-basic.js +++ b/test/pummel/test-stream2-basic.js @@ -168,7 +168,6 @@ test('pipe', function(t) { }); - [1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(function(SPLIT) { test('unpipe', function(t) { var r = new TestReader(5); diff --git a/test/sequential/test-pipe.js b/test/sequential/test-pipe.js index 2ef19c37ea..c311a64d71 100644 --- a/test/sequential/test-pipe.js +++ b/test/sequential/test-pipe.js @@ -51,7 +51,6 @@ var web = http.Server(function(req, res) { web.listen(webPort, startClient); - var tcp = net.Server(function(s) { tcp.close(); diff --git a/test/sequential/test-regress-GH-3542.js b/test/sequential/test-regress-GH-3542.js index 80f2a4c9c3..16981da469 100644 --- a/test/sequential/test-regress-GH-3542.js +++ b/test/sequential/test-regress-GH-3542.js @@ -31,4 +31,4 @@ test(process.env.windir); process.on('exit', function() { assert.strictEqual(succeeded, 7); -}); \ No newline at end of file +}); diff --git a/test/sequential/test-regress-GH-4948.js b/test/sequential/test-regress-GH-4948.js index c87ade9850..c6953eb78f 100644 --- a/test/sequential/test-regress-GH-4948.js +++ b/test/sequential/test-regress-GH-4948.js @@ -40,4 +40,4 @@ sock.connect(common.PORT, 'localhost'); sock.on('connect', function() { sock.write('GET / HTTP/1.1\r\n\r\n'); sock.end(); -}); \ No newline at end of file +}); diff --git a/test/sequential/test-regress-GH-784.js b/test/sequential/test-regress-GH-784.js index 08f660add3..0c70337de7 100644 --- a/test/sequential/test-regress-GH-784.js +++ b/test/sequential/test-regress-GH-784.js @@ -117,18 +117,13 @@ function ping() { } - function pingping() { ping(); ping(); } - pingping(); - - - process.on('exit', function() { console.error("process.on('exit')"); console.error(responses);