From 95bae858094450bd01f858ddd358ae0f83865157 Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Mon, 19 Feb 2018 02:25:54 +0100
Subject: [PATCH] errors: simplify sysError

PR-URL: https://github.com/nodejs/node/pull/18857
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
---
 lib/internal/errors.js | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index a170c349aeea89..9816474d7a067a 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -841,7 +841,7 @@ E('ERR_STREAM_UNSHIFT_AFTER_END_EVENT',
   'stream.unshift() after end event', Error);
 E('ERR_STREAM_WRAP', 'Stream has StringDecoder set or is in objectMode', Error);
 E('ERR_STREAM_WRITE_AFTER_END', 'write after end', Error);
-E('ERR_SYSTEM_ERROR', sysError('A system error occurred'));
+E('ERR_SYSTEM_ERROR', sysError);
 E('ERR_TLS_CERT_ALTNAME_INVALID',
   'Hostname/IP does not match certificate\'s altnames: %s', Error);
 E('ERR_TLS_DH_PARAM_SIZE', 'DH parameter size %s is less than 2048', Error);
@@ -902,26 +902,21 @@ E('ERR_VM_MODULE_STATUS', 'Module status %s', Error);
 E('ERR_ZLIB_BINDING_CLOSED', 'zlib binding closed', Error);
 E('ERR_ZLIB_INITIALIZATION_FAILED', 'Initialization failed', Error);
 
-function sysError(defaultMessage) {
-  return function(code,
-                  syscall,
-                  path,
-                  dest,
-                  message = defaultMessage) {
-    if (code !== undefined)
-      message += `: ${code}`;
-    if (syscall !== undefined) {
-      if (code === undefined)
-        message += ':';
-      message += ` [${syscall}]`;
-    }
-    if (path !== undefined) {
-      message += `: ${path}`;
-      if (dest !== undefined)
-        message += ` => ${dest}`;
-    }
-    return message;
-  };
+function sysError(code, syscall, path, dest,
+                  message = 'A system error occurred') {
+  if (code !== undefined)
+    message += `: ${code}`;
+  if (syscall !== undefined) {
+    if (code === undefined)
+      message += ':';
+    message += ` [${syscall}]`;
+  }
+  if (path !== undefined) {
+    message += `: ${path}`;
+    if (dest !== undefined)
+      message += ` => ${dest}`;
+  }
+  return message;
 }
 
 function invalidArgType(name, expected, actual) {