Skip to content

Commit 779a577

Browse files
gengjiawentargos
authored andcommitted
src: refactor macro to std::min in node_buffer.cc
PR-URL: #25919 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
1 parent 237b5e6 commit 779a577

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

src/node_buffer.cc

+12-13
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
#include <string.h>
3535
#include <limits.h>
3636

37-
#define MIN(a, b) ((a) < (b) ? (a) : (b))
38-
3937
#define THROW_AND_RETURN_UNLESS_BUFFER(env, obj) \
4038
THROW_AND_RETURN_IF_NOT_BUFFER(env, obj, "argument") \
4139

@@ -516,9 +514,9 @@ void Copy(const FunctionCallbackInfo<Value> &args) {
516514
if (source_end - source_start > target_length - target_start)
517515
source_end = source_start + target_length - target_start;
518516

519-
uint32_t to_copy = MIN(MIN(source_end - source_start,
520-
target_length - target_start),
521-
ts_obj_length - source_start);
517+
uint32_t to_copy = std::min(
518+
std::min(source_end - source_start, target_length - target_start),
519+
ts_obj_length - source_start);
522520

523521
memmove(target_data + target_start, ts_obj_data + source_start, to_copy);
524522
args.GetReturnValue().Set(to_copy);
@@ -549,7 +547,8 @@ void Fill(const FunctionCallbackInfo<Value>& args) {
549547
if (Buffer::HasInstance(args[1])) {
550548
SPREAD_BUFFER_ARG(args[1], fill_obj);
551549
str_length = fill_obj_length;
552-
memcpy(ts_obj_data + start, fill_obj_data, MIN(str_length, fill_length));
550+
memcpy(
551+
ts_obj_data + start, fill_obj_data, std::min(str_length, fill_length));
553552
goto start_fill;
554553
}
555554

@@ -570,15 +569,15 @@ void Fill(const FunctionCallbackInfo<Value>& args) {
570569
if (enc == UTF8) {
571570
str_length = str_obj->Utf8Length(env->isolate());
572571
node::Utf8Value str(env->isolate(), args[1]);
573-
memcpy(ts_obj_data + start, *str, MIN(str_length, fill_length));
572+
memcpy(ts_obj_data + start, *str, std::min(str_length, fill_length));
574573

575574
} else if (enc == UCS2) {
576575
str_length = str_obj->Length() * sizeof(uint16_t);
577576
node::TwoByteValue str(env->isolate(), args[1]);
578577
if (IsBigEndian())
579578
SwapBytes16(reinterpret_cast<char*>(&str[0]), str_length);
580579

581-
memcpy(ts_obj_data + start, *str, MIN(str_length, fill_length));
580+
memcpy(ts_obj_data + start, *str, std::min(str_length, fill_length));
582581

583582
} else {
584583
// Write initial String to Buffer, then use that memory to copy remainder
@@ -643,7 +642,7 @@ void StringWrite(const FunctionCallbackInfo<Value>& args) {
643642
THROW_AND_RETURN_IF_OOB(ParseArrayIndex(env, args[2], ts_obj_length - offset,
644643
&max_length));
645644

646-
max_length = MIN(ts_obj_length - offset, max_length);
645+
max_length = std::min(ts_obj_length - offset, max_length);
647646

648647
if (max_length == 0)
649648
return args.GetReturnValue().Set(0);
@@ -712,9 +711,9 @@ void CompareOffset(const FunctionCallbackInfo<Value> &args) {
712711
CHECK_LE(source_start, source_end);
713712
CHECK_LE(target_start, target_end);
714713

715-
size_t to_cmp = MIN(MIN(source_end - source_start,
716-
target_end - target_start),
717-
ts_obj_length - source_start);
714+
size_t to_cmp =
715+
std::min(std::min(source_end - source_start, target_end - target_start),
716+
ts_obj_length - source_start);
718717

719718
int val = normalizeCompareVal(to_cmp > 0 ?
720719
memcmp(ts_obj_data + source_start,
@@ -734,7 +733,7 @@ void Compare(const FunctionCallbackInfo<Value> &args) {
734733
SPREAD_BUFFER_ARG(args[0], obj_a);
735734
SPREAD_BUFFER_ARG(args[1], obj_b);
736735

737-
size_t cmp_length = MIN(obj_a_length, obj_b_length);
736+
size_t cmp_length = std::min(obj_a_length, obj_b_length);
738737

739738
int val = normalizeCompareVal(cmp_length > 0 ?
740739
memcmp(obj_a_data, obj_b_data, cmp_length) : 0,

0 commit comments

Comments
 (0)