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 8469b9eff75100c42b6ad0eaef4a401623df1eb5..1266383f933349dc09c3a5c73a0cd4d4c824e885 100644 (file)
--- 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 5c2782f43888315cf465bc431fc9d5b3be45760e..d8dcf13ca10f1bab91b722a482f82c3e8d890865 100644 (file)
--- 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