From 2666e006e180ea16dda292b9b719bd4ed02bc261 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 28 Aug 2019 14:35:36 +0200 Subject: [PATCH] src: inline `SLICE_START_END()` in node_buffer.cc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This macro is only used once, so it doesn’t need to be a macro. PR-URL: https://github.com/nodejs/node/pull/29357 Reviewed-By: Jiawen Geng Reviewed-By: Masashi Hirano Reviewed-By: Colin Ihrig Reviewed-By: Luigi Pinca Reviewed-By: James M Snell Reviewed-By: Richard Lau Reviewed-By: Michael Dawson --- src/node_buffer.cc | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/node_buffer.cc b/src/node_buffer.cc index 7332b0b34b035e..ff5caeade2732e 100644 --- a/src/node_buffer.cc +++ b/src/node_buffer.cc @@ -44,15 +44,6 @@ return node::THROW_ERR_OUT_OF_RANGE(env, "Index out of range"); \ } while (0) \ -#define SLICE_START_END(env, start_arg, end_arg, end_max) \ - size_t start = 0; \ - size_t end = 0; \ - THROW_AND_RETURN_IF_OOB(ParseArrayIndex(env, start_arg, 0, &start)); \ - THROW_AND_RETURN_IF_OOB(ParseArrayIndex(env, end_arg, end_max, &end)); \ - if (end < start) end = start; \ - THROW_AND_RETURN_IF_OOB(Just(end <= end_max)); \ - size_t length = end - start; - namespace node { namespace Buffer { @@ -467,7 +458,13 @@ void StringSlice(const FunctionCallbackInfo& args) { if (buffer.length() == 0) return args.GetReturnValue().SetEmptyString(); - SLICE_START_END(env, args[0], args[1], buffer.length()) + size_t start = 0; + size_t end = 0; + THROW_AND_RETURN_IF_OOB(ParseArrayIndex(env, args[0], 0, &start)); + THROW_AND_RETURN_IF_OOB(ParseArrayIndex(env, args[1], buffer.length(), &end)); + if (end < start) end = start; + THROW_AND_RETURN_IF_OOB(Just(end <= buffer.length())); + size_t length = end - start; Local error; MaybeLocal ret =