From 279fcc44fa3590a3255d316d03e93a0b58696b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= Date: Sat, 17 Jun 2017 15:59:20 +0200 Subject: [PATCH] dgram: change parameter name in set(Multicast)TTL Changed the parameter name in set(Multicast)TTL from "arg" to "ttl" both within code and error messages and added the actual type of the argument to the error message. PR-URL: https://github.com/nodejs/node/pull/13747 Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Luigi Pinca Reviewed-By: Colin Ihrig --- lib/dgram.js | 24 ++++++++------------ test/parallel/test-dgram-multicast-setTTL.js | 2 +- test/parallel/test-dgram-setTTL.js | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/lib/dgram.js b/lib/dgram.js index 0d93ca28748..55753b17727 100644 --- a/lib/dgram.js +++ b/lib/dgram.js @@ -524,35 +524,31 @@ Socket.prototype.setBroadcast = function(arg) { }; -Socket.prototype.setTTL = function(arg) { - if (typeof arg !== 'number') { - throw new errors.TypeError('ERR_INVALID_ARG_TYPE', - 'arg', - 'number'); +Socket.prototype.setTTL = function(ttl) { + if (typeof ttl !== 'number') { + throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'ttl', 'number', ttl); } - var err = this._handle.setTTL(arg); + var err = this._handle.setTTL(ttl); if (err) { throw errnoException(err, 'setTTL'); } - return arg; + return ttl; }; -Socket.prototype.setMulticastTTL = function(arg) { - if (typeof arg !== 'number') { - throw new errors.TypeError('ERR_INVALID_ARG_TYPE', - 'arg', - 'number'); +Socket.prototype.setMulticastTTL = function(ttl) { + if (typeof ttl !== 'number') { + throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'ttl', 'number', ttl); } - var err = this._handle.setMulticastTTL(arg); + var err = this._handle.setMulticastTTL(ttl); if (err) { throw errnoException(err, 'setMulticastTTL'); } - return arg; + return ttl; }; diff --git a/test/parallel/test-dgram-multicast-setTTL.js b/test/parallel/test-dgram-multicast-setTTL.js index b7d1e01b321..bd04ce4f32b 100644 --- a/test/parallel/test-dgram-multicast-setTTL.js +++ b/test/parallel/test-dgram-multicast-setTTL.js @@ -40,7 +40,7 @@ socket.on('listening', common.mustCall(() => { }, common.expectsError({ code: 'ERR_INVALID_ARG_TYPE', type: TypeError, - message: /^The "arg" argument must be of type number$/ + message: 'The "ttl" argument must be of type number. Received type string' })); //close the socket diff --git a/test/parallel/test-dgram-setTTL.js b/test/parallel/test-dgram-setTTL.js index c061fbc1870..840a3f4d09f 100644 --- a/test/parallel/test-dgram-setTTL.js +++ b/test/parallel/test-dgram-setTTL.js @@ -14,7 +14,7 @@ socket.on('listening', common.mustCall(() => { }, common.expectsError({ code: 'ERR_INVALID_ARG_TYPE', type: TypeError, - message: /^The "arg" argument must be of type number$/ + message: 'The "ttl" argument must be of type number. Received type string' })); // TTL must be a number from > 0 to < 256