mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bufio: use max/min func 

Change-Id: I39e03e2e00964cf4e3ff7df3c40b995a48040aec
This commit is contained in:
qiulaidongfeng 2023-10-03 13:53:56 +08:00
parent 122b35e838
commit dfb2a343e6
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bufio/bufio.go
View File

@ -50,11 +50,8 @@ func NewReaderSize(rd io.Reader, size int) *Reader {
if ok && len(b.buf) >= size { if ok && len(b.buf) >= size {
return b return b
} }
if size < minReadBufferSize {
size = minReadBufferSize
}
r := new(Reader) r := new(Reader)
r.reset(make([]byte, size), rd) r.reset(make([]byte, max(size, minReadBufferSize)), rd)
return r return r
} }

4
src/bufio/scan.go
View File

@ -198,9 +198,7 @@ func (s *Scanner) Scan() bool {
if newSize == 0 { if newSize == 0 {
newSize = startBufSize newSize = startBufSize
} }
if newSize > s.maxTokenSize { newSize = min(newSize, s.maxTokenSize)
newSize = s.maxTokenSize
}
newBuf := make([]byte, newSize) newBuf := make([]byte, newSize)
copy(newBuf, s.buf[s.start:s.end]) copy(newBuf, s.buf[s.start:s.end])
s.buf = newBuf s.buf = newBuf