Skip to content

Commit b7c1126

Browse files
authored
Remove unnecessary allowNull argument from getSocketAddress. NFC (#22643)
The only callsite that was using this third argument was simply doing and early return, so we can just move the check to the caller and simplify the code.
1 parent f508b43 commit b7c1126

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/library_syscall.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -324,11 +324,8 @@ var SyscallsLibrary = {
324324
#endif
325325
return socket;
326326
},
327-
/** @param {boolean=} allowNull */
328327
$getSocketAddress__deps: ['$readSockaddr', '$FS', '$DNS'],
329-
$getSocketAddress__docs: '/** @param {boolean=} allowNull */',
330-
$getSocketAddress: (addrp, addrlen, allowNull) => {
331-
if (allowNull && addrp === 0) return null;
328+
$getSocketAddress: (addrp, addrlen) => {
332329
var info = readSockaddr(addrp, addrlen);
333330
if (info.errno) throw new FS.ErrnoError(info.errno);
334331
info.addr = DNS.lookup_addr(info.addr) || info.addr;
@@ -421,11 +418,11 @@ var SyscallsLibrary = {
421418
__syscall_sendto__deps: ['$getSocketFromFD', '$getSocketAddress'],
422419
__syscall_sendto: (fd, message, length, flags, addr, addr_len) => {
423420
var sock = getSocketFromFD(fd);
424-
var dest = getSocketAddress(addr, addr_len, true);
425-
if (!dest) {
421+
if (!addr) {
426422
// send, no address provided
427423
return FS.write(sock.stream, HEAP8, message, length);
428424
}
425+
var dest = getSocketAddress(addr, addr_len);
429426
// sendto an address
430427
return sock.sock_ops.sendmsg(sock, HEAP8, message, length, dest.addr, dest.port);
431428
},

0 commit comments

Comments
 (0)