Skip to content

Commit

Permalink
squash: flip !encoding -> encoding
Browse files Browse the repository at this point in the history
  • Loading branch information
Trott committed Jun 27, 2016
1 parent 7059a85 commit c9ccd19
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions lib/child_process.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,12 @@ exports.execFile = function(file /*, args, options, callback*/) {
// merge chunks
var stdout;
var stderr;
if (!encoding) {
stdout = Buffer.concat(_stdout);
stderr = Buffer.concat(_stderr);
} else {
if (encoding) {
stdout = _stdout;
stderr = _stderr;
} else {
stdout = Buffer.concat(_stdout);
stderr = Buffer.concat(_stderr);
}

if (ex) {
Expand Down Expand Up @@ -255,10 +255,10 @@ exports.execFile = function(file /*, args, options, callback*/) {
ex = new Error('stdout maxBuffer exceeded');
kill();
} else {
if (!encoding)
_stdout.push(chunk);
else
if (encoding)
_stdout += chunk;
else
_stdout.push(chunk);
}
});
}
Expand All @@ -274,10 +274,10 @@ exports.execFile = function(file /*, args, options, callback*/) {
ex = new Error('stderr maxBuffer exceeded');
kill();
} else {
if (!encoding)
_stderr.push(chunk);
else
if (encoding)
_stderr += chunk;
else
_stderr.push(chunk);
}
});
}
Expand Down

0 comments on commit c9ccd19

Please sign in to comment.