child_process: replace var with let/const

dnlup · addaleax · commit dae36a9692c7 · 2019-11-30T03:56:11.000+01:00
PR-URL: #30389 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
diff --git a/lib/child_process.js b/lib/child_process.js
@@ -55,10 +55,10 @@ function fork(modulePath /* , args, options */){
 validateString(modulePath, 'modulePath');
 
 // Get options and args arguments.
- var execArgv;
- var options ={};
- var args = [];
- var pos = 1;
+ let execArgv;
+ let options ={};
+ let args = [];
+ let pos = 1;
 if (pos < arguments.length && Array.isArray(arguments[pos])){
 args = arguments[pos++];
 }
@@ -231,23 +231,23 @@ function execFile(file /* , args, options, callback */){
 windowsVerbatimArguments: !!options.windowsVerbatimArguments
 });
 
- var encoding;
+ let encoding;
 const _stdout = [];
 const _stderr = [];
 if (options.encoding !== 'buffer' && Buffer.isEncoding(options.encoding)){
 encoding = options.encoding;
 } else{
 encoding = null;
 }
- var stdoutLen = 0;
- var stderrLen = 0;
- var killed = false;
- var exited = false;
- var timeoutId;
+ let stdoutLen = 0;
+ let stderrLen = 0;
+ let killed = false;
+ let exited = false;
+ let timeoutId;
 
- var ex = null;
+ let ex = null;
 
- var cmd = file;
+ let cmd = file;
 
 function exithandler(code, signal){
 if (exited) return;
@@ -261,8 +261,8 @@ function execFile(file /* , args, options, callback */){
 if (!callback) return;
 
 // merge chunks
- var stdout;
- var stderr;
+ let stdout;
+ let stderr;
 if (encoding ||
 (
 child.stdout &&
@@ -562,15 +562,15 @@ function spawnSync(file, args, options){
 options.stdio = getValidStdio(options.stdio || 'pipe', true).stdio;
 
 if (options.input){
- var stdin = options.stdio[0] ={...options.stdio[0] };
+ const stdin = options.stdio[0] ={...options.stdio[0] };
 stdin.input = options.input;
 }
 
 // We may want to pass data in on any given fd, ensure it is a valid buffer
- for (var i = 0; i < options.stdio.length; i++){
- var input = options.stdio[i] && options.stdio[i].input;
+ for (let i = 0; i < options.stdio.length; i++){
+ const input = options.stdio[i] && options.stdio[i].input;
 if (input != null){
- var pipe = options.stdio[i] ={...options.stdio[i] };
+ const pipe = options.stdio[i] ={...options.stdio[i] };
 if (isArrayBufferView(input)){
 pipe.input = input;
 } else if (typeof input === 'string'){
@@ -591,11 +591,11 @@ function spawnSync(file, args, options){
 
 
 function checkExecSyncError(ret, args, cmd){
- var err;
+ let err;
 if (ret.error){
 err = ret.error;
 } else if (ret.status !== 0){
- var msg = 'Command failed: ';
+ let msg = 'Command failed: ';
 msg += cmd || args.join(' ');
 if (ret.stderr && ret.stderr.length > 0)
 msg += `\n${ret.stderr.toString()}`;

-Original file line number
+Diff line change
 validateString(modulePath,'modulePath');
 // Get options and args arguments.
 -varexecArgv;
 -varoptions={};
 -varargs=[];
 -varpos=1;
 +letexecArgv;
 +letoptions={};
 +letargs=[];
 +letpos=1;
 if(pos<arguments.length&&Array.isArray(arguments[pos])){
 args=arguments[pos++];
+}
 windowsVerbatimArguments: !!options.windowsVerbatimArguments
 });
 -varencoding;
 +letencoding;
 const_stdout=[];
 const_stderr=[];
 if(options.encoding!=='buffer'&&Buffer.isEncoding(options.encoding)){
 encoding=options.encoding;
 }else{
 encoding=null;
+}
 -varstdoutLen=0;
 -varstderrLen=0;
 -varkilled=false;
 -varexited=false;
 -vartimeoutId;
 +letstdoutLen=0;
 +letstderrLen=0;
 +letkilled=false;
 +letexited=false;
 +lettimeoutId;
 -varex=null;
 +letex=null;
 -varcmd=file;
 +letcmd=file;
 functionexithandler(code,signal){
 if(exited)return;
 if(!callback)return;
 // merge chunks
 -varstdout;
 -varstderr;
 +letstdout;
 +letstderr;
 if(encoding||
+(
 child.stdout&&
 options.stdio=getValidStdio(options.stdio||'pipe',true).stdio;
 if(options.input){
 -varstdin=options.stdio[0]={ ...options.stdio[0]};
 +conststdin=options.stdio[0]={ ...options.stdio[0]};
 stdin.input=options.input;
+}
 // We may want to pass data in on any given fd, ensure it is a valid buffer
 -for(vari=0;i<options.stdio.length;i++){
 -varinput=options.stdio[i]&&options.stdio[i].input;
 +for(leti=0;i<options.stdio.length;i++){
 +constinput=options.stdio[i]&&options.stdio[i].input;
 if(input!=null){
 -varpipe=options.stdio[i]={ ...options.stdio[i]};
 +constpipe=options.stdio[i]={ ...options.stdio[i]};
 if(isArrayBufferView(input)){
 pipe.input=input;
 }elseif(typeofinput==='string'){
 functioncheckExecSyncError(ret,args,cmd){
 -varerr;
 +leterr;
 if(ret.error){
 err=ret.error;
 }elseif(ret.status!==0){
 -varmsg='Command failed: ';
 +letmsg='Command failed: ';
 msg+=cmd||args.join(' ');
 if(ret.stderr&&ret.stderr.length>0)
 msg+=`\n${ret.stderr.toString()}`;