diff options
| author | Anna Henningsen <anna@addaleax.net> | 2019-08-28 14:35:36 +0200 |
|---|---|---|
| committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2019-09-02 07:56:56 +0200 |
| commit | 5a52bdad9ba95ef20a8af1a1f2bd72c008cbf2f1 (patch) | |
| tree | 0e6c774adbae41756ef2413e88391357c87e65a9 | |
| parent | 61d973affbf37ff4011e387a87b89f8c9984b20e (diff) | |
| download | node-new-5a52bdad9ba95ef20a8af1a1f2bd72c008cbf2f1.tar.gz | |
src: inline `SLICE_START_END()` in node_buffer.cc
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 <technicalcute@gmail.com>
Reviewed-By: Masashi Hirano <shisama07@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
| -rw-r--r-- | src/node_buffer.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/node_buffer.cc b/src/node_buffer.cc index 56e2847389..220b9cf42a 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<Value>& 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<Value> error; MaybeLocal<Value> ret = |