From: qiulaidongfeng <2645477756@qq.com>
Date: Wed, 4 Oct 2023 03:23:54 +0000 (+0000)
Subject: bufio: use max/min func
X-Git-Tag: go1.22rc1~688
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=774d001d178569283cb719bd062cf5d18de51f47;p=gostls13.git

bufio: use max/min func

Change-Id: I52875f8dd4bbdc9296ba8e4f801356047ee14e62
GitHub-Last-Rev: dfb2a343e60f0994a5741e1b4534e464a80ba2ef
GitHub-Pull-Request: golang/go#63344
Reviewed-on: https://go-review.googlesource.com/c/go/+/532216
Reviewed-by: Robert Griesemer <gri@google.com>
Reviewed-by: Keith Randall <khr@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@google.com>
Run-TryBot: Robert Griesemer <gri@google.com>
Auto-Submit: Robert Griesemer <gri@google.com>
---

diff --git a/src/bufio/bufio.go b/src/bufio/bufio.go
index 8469b9eff7..1266383f93 100644
--- a/src/bufio/bufio.go
+++ b/src/bufio/bufio.go
@@ -50,11 +50,8 @@ func NewReaderSize(rd io.Reader, size int) *Reader {
 	if ok && len(b.buf) >= size {
 		return b
 	}
-	if size < minReadBufferSize {
-		size = minReadBufferSize
-	}
 	r := new(Reader)
-	r.reset(make([]byte, size), rd)
+	r.reset(make([]byte, max(size, minReadBufferSize)), rd)
 	return r
 }
 
diff --git a/src/bufio/scan.go b/src/bufio/scan.go
index 5c2782f438..d8dcf13ca1 100644
--- a/src/bufio/scan.go
+++ b/src/bufio/scan.go
@@ -198,9 +198,7 @@ func (s *Scanner) Scan() bool {
 			if newSize == 0 {
 				newSize = startBufSize
 			}
-			if newSize > s.maxTokenSize {
-				newSize = s.maxTokenSize
-			}
+			newSize = min(newSize, s.maxTokenSize)
 			newBuf := make([]byte, newSize)
 			copy(newBuf, s.buf[s.start:s.end])
 			s.buf = newBuf