child_process: simplify argument handling

This commit simplifies the calling of normalizeSpawnArguments() and normalizeExecArguments(). Specifically, this commit replaces apply() and the use of arguments with a normal function call. PR-URL: #25194 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Jan 1, 2019 · 56e7e4f · 56e7e4f
1 parent 7e2ae75
commit 56e7e4f
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/lib/child_process.js b/lib/child_process.js
@@ -147,8 +147,8 @@ function normalizeExecArgs(command, options, callback) {
 }
 
 
-exports.exec = function exec(/* command , options, callback */) {
-  const opts = normalizeExecArgs.apply(null, arguments);
+exports.exec = function exec(command, options, callback) {
+  const opts = normalizeExecArgs(command, options, callback);
   return exports.execFile(opts.file,
                           opts.options,
                           opts.callback);
@@ -534,11 +534,11 @@ function normalizeSpawnArguments(file, args, options) {
 }
 
 
-var spawn = exports.spawn = function spawn(/* file, args, options */) {
-  var opts = normalizeSpawnArguments.apply(null, arguments);
-  var options = opts.options;
-  var child = new ChildProcess();
+var spawn = exports.spawn = function spawn(file, args, options) {
+  const opts = normalizeSpawnArguments(file, args, options);
+  const child = new ChildProcess();
 
+  options = opts.options;
   debug('spawn', opts.args, options);
 
   child.spawn({
@@ -557,10 +557,10 @@ var spawn = exports.spawn = function spawn(/* file, args, options */) {
   return child;
 };
 
-function spawnSync(/* file, args, options */) {
-  var opts = normalizeSpawnArguments.apply(null, arguments);
+function spawnSync(file, args, options) {
+  const opts = normalizeSpawnArguments(file, args, options);
 
-  var options = opts.options;
+  options = opts.options;
 
   debug('spawnSync', opts.args, options);
 
@@ -628,8 +628,8 @@ function checkExecSyncError(ret, args, cmd) {
 }
 
 
-function execFileSync(/* command, args, options */) {
-  var opts = normalizeSpawnArguments.apply(null, arguments);
+function execFileSync(command, args, options) {
+  var opts = normalizeSpawnArguments(command, args, options);
   var inheritStderr = !opts.options.stdio;
 
   var ret = spawnSync(opts.file, opts.args.slice(1), opts.options);
@@ -647,8 +647,8 @@ function execFileSync(/* command, args, options */) {
 exports.execFileSync = execFileSync;
 
 
-function execSync(command /* , options */) {
-  var opts = normalizeExecArgs.apply(null, arguments);
+function execSync(command, options) {
+  var opts = normalizeExecArgs(command, options, null);
   var inheritStderr = !opts.options.stdio;
 
   var ret = spawnSync(opts.file, opts.options);