Skip to content

Commit

Permalink
lib: consolidate lazyErrmapGet()
Browse files Browse the repository at this point in the history
There are currently two implementations of this function.
This commit removes the redundancy, and removes "lazy" from
the name.

PR-URL: #29285
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Trivikram Kamat <[email protected]>
  • Loading branch information
cjihrig authored and BridgeAR committed Sep 4, 2019
1 parent 8a93b63 commit 6e585fb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 20 deletions.
7 changes: 4 additions & 3 deletions lib/internal/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ function lazyUv() {
return uvBinding;
}

function lazyErrmapGet(name) {
function uvErrmapGet(name) {
uvBinding = lazyUv();
if (!uvBinding.errmap) {
uvBinding.errmap = uvBinding.getErrorMap();
Expand All @@ -346,7 +346,7 @@ function lazyErrmapGet(name) {
* @returns {Error}
*/
function uvException(ctx) {
const [ code, uvmsg ] = lazyErrmapGet(ctx.errno);
const [ code, uvmsg ] = uvErrmapGet(ctx.errno);
let message = `${code}: ${ctx.message || uvmsg}, ${ctx.syscall}`;

let path;
Expand Down Expand Up @@ -404,7 +404,7 @@ function uvException(ctx) {
* @returns {Error}
*/
function uvExceptionWithHostPort(err, syscall, address, port) {
const [ code, uvmsg ] = lazyErrmapGet(err);
const [ code, uvmsg ] = uvErrmapGet(err);
const message = `${syscall} ${code}: ${uvmsg}`;
let details = '';

Expand Down Expand Up @@ -666,6 +666,7 @@ module.exports = {
hideStackFrames,
isStackOverflowError,
connResetException,
uvErrmapGet,
uvException,
uvExceptionWithHostPort,
SystemError,
Expand Down
25 changes: 8 additions & 17 deletions lib/internal/util.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
'use strict';

const { Object, Reflect } = primordials;

const {
ERR_INVALID_ARG_TYPE,
ERR_NO_CRYPTO,
ERR_UNKNOWN_SIGNAL
} = require('internal/errors').codes;
codes: {
ERR_INVALID_ARG_TYPE,
ERR_NO_CRYPTO,
ERR_UNKNOWN_SIGNAL
},
uvErrmapGet
} = require('internal/errors');
const { signals } = internalBinding('constants').os;
const {
getHiddenValue,
Expand Down Expand Up @@ -244,19 +246,8 @@ function getConstructorOf(obj) {
return null;
}

let uvBinding;
function lazyErrmapGet(name) {
if (!uvBinding) {
uvBinding = internalBinding('uv');
}
if (!uvBinding.errmap) {
uvBinding.errmap = uvBinding.getErrorMap();
}
return uvBinding.errmap.get(name);
}

function getSystemErrorName(err) {
const entry = lazyErrmapGet(err);
const entry = uvErrmapGet(err);
return entry ? entry[0] : `Unknown system error ${err}`;
}

Expand Down

0 comments on commit 6e585fb

Please sign in to comment.