fs: fix to not return for void function

Jungku Lee · UlisesGascon · commit cada22e2a4c8 · 2023-12-19T16:17:54.000Z
PR-URL: #50769 Reviewed-By: Matthew Aitken <maitken033380023@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Qingyu Deng <i@ayase-lab.com>
diff --git a/lib/fs.js b/lib/fs.js
@@ -534,7 +534,7 @@ function close(fd, callback = defaultCloseCallback){
 function closeSync(fd){
 fd = getValidatedFd(fd);
 
- return binding.close(fd);
+ binding.close(fd);
 }
 
 /**
@@ -784,7 +784,7 @@ function readv(fd, buffers, position, callback){
 if (typeof position !== 'number')
 position = null;
 
- return binding.readBuffers(fd, buffers, position, req);
+ binding.readBuffers(fd, buffers, position, req);
 }
 
 ObjectDefineProperty(readv, kCustomPromisifyArgsSymbol,
@@ -860,7 +860,8 @@ function write(fd, buffer, offsetOrOptions, length, position, callback){
 
 const req = new FSReqCallback();
 req.oncomplete = wrapper;
- return binding.writeBuffer(fd, buffer, offset, length, position, req);
+ binding.writeBuffer(fd, buffer, offset, length, position, req);
+ return;
 }
 
 validateStringAfterArrayBufferView(buffer, 'buffer');
@@ -881,7 +882,7 @@ function write(fd, buffer, offsetOrOptions, length, position, callback){
 
 const req = new FSReqCallback();
 req.oncomplete = wrapper;
- return binding.writeString(fd, str, offset, length, req);
+ binding.writeString(fd, str, offset, length, req);
 }
 
 ObjectDefineProperty(write, kCustomPromisifyArgsSymbol,
@@ -971,7 +972,7 @@ function writev(fd, buffers, position, callback){
 if (typeof position !== 'number')
 position = null;
 
- return binding.writeBuffers(fd, buffers, position, req);
+ binding.writeBuffers(fd, buffers, position, req);
 }
 
 ObjectDefineProperty(writev, kCustomPromisifyArgsSymbol,{
@@ -1177,7 +1178,8 @@ function rmdir(path, options, callback){
 if (err === false){
 const req = new FSReqCallback();
 req.oncomplete = callback;
- return binding.rmdir(path, req);
+ binding.rmdir(path, req);
+ return;
 }
 if (err){
 return callback(err);
@@ -1190,7 +1192,7 @@ function rmdir(path, options, callback){
 validateRmdirOptions(options);
 const req = new FSReqCallback();
 req.oncomplete = callback;
- return binding.rmdir(path, req);
+ binding.rmdir(path, req);
 }
 }
 
@@ -1296,7 +1298,7 @@ function fdatasync(fd, callback){
 */
 function fdatasyncSync(fd){
 fd = getValidatedFd(fd);
- return binding.fdatasync(fd);
+ binding.fdatasync(fd);
 }
 
 /**
@@ -1321,7 +1323,7 @@ function fsync(fd, callback){
 */
 function fsyncSync(fd){
 fd = getValidatedFd(fd);
- return binding.fsync(fd);
+ binding.fsync(fd);
 }
 
 /**
@@ -1888,7 +1890,7 @@ function unlink(path, callback){
 */
 function unlinkSync(path){
 path = pathModule.toNamespacedPath(getValidatedPath(path));
- return binding.unlink(path);
+ binding.unlink(path);
 }
 
 /**
@@ -2929,7 +2931,7 @@ realpath.native = (path, options, callback) =>{
 path = getValidatedPath(path);
 const req = new FSReqCallback();
 req.oncomplete = callback;
- return binding.realpath(pathModule.toNamespacedPath(path), options.encoding, req);
+ binding.realpath(pathModule.toNamespacedPath(path), options.encoding, req);
 };
 
 /**

-Original file line number
+Diff line change
 functioncloseSync(fd){
 fd=getValidatedFd(fd);
 -returnbinding.close(fd);
 +binding.close(fd);
+}
 /**
 if(typeofposition!=='number')
 position=null;
 -returnbinding.readBuffers(fd,buffers,position,req);
 +binding.readBuffers(fd,buffers,position,req);
+}
 ObjectDefineProperty(readv,kCustomPromisifyArgsSymbol,
 constreq=newFSReqCallback();
 req.oncomplete=wrapper;
 -returnbinding.writeBuffer(fd,buffer,offset,length,position,req);
 +binding.writeBuffer(fd,buffer,offset,length,position,req);
 +return;
+}
 validateStringAfterArrayBufferView(buffer,'buffer');
 constreq=newFSReqCallback();
 req.oncomplete=wrapper;
 -returnbinding.writeString(fd,str,offset,length,req);
 +binding.writeString(fd,str,offset,length,req);
+}
 ObjectDefineProperty(write,kCustomPromisifyArgsSymbol,
 if(typeofposition!=='number')
 position=null;
 -returnbinding.writeBuffers(fd,buffers,position,req);
 +binding.writeBuffers(fd,buffers,position,req);
+}
 ObjectDefineProperty(writev,kCustomPromisifyArgsSymbol,{
 if(err===false){
 constreq=newFSReqCallback();
 req.oncomplete=callback;
 -returnbinding.rmdir(path,req);
 +binding.rmdir(path,req);
 +return;
+}
 if(err){
 returncallback(err);
 validateRmdirOptions(options);
 constreq=newFSReqCallback();
 req.oncomplete=callback;
 -returnbinding.rmdir(path,req);
 +binding.rmdir(path,req);
+}
+}
  */
 functionfdatasyncSync(fd){
 fd=getValidatedFd(fd);
 -returnbinding.fdatasync(fd);
 +binding.fdatasync(fd);
+}
 /**
  */
 functionfsyncSync(fd){
 fd=getValidatedFd(fd);
 -returnbinding.fsync(fd);
 +binding.fsync(fd);
+}
 /**
  */
 functionunlinkSync(path){
 path=pathModule.toNamespacedPath(getValidatedPath(path));
 -returnbinding.unlink(path);
 +binding.unlink(path);
+}
 /**
 path=getValidatedPath(path);
 constreq=newFSReqCallback();
 req.oncomplete=callback;
 -returnbinding.realpath(pathModule.toNamespacedPath(path),options.encoding,req);
 +binding.realpath(pathModule.toNamespacedPath(path),options.encoding,req);
 };
 /**