[go] bufio.Reset: when argument io.Reader is nil, Reader initializes the internal buffer to the default size
Gerrit Bot (Gerrit)
Gerrit Bot has uploaded this change for review.
bufio.Reset: when argument io.Reader is nil, Reader initializes the internal buffer to the default size
it makes sense to reset the underline reader's buffer with the defaultBufSize when nil is given as an argument to the reset function
Change-Id: Ie954fa144488a40081580000b1ba78244563171c
GitHub-Last-Rev: 1f1cc44b0a64fa379b5a187da3968f856577b2dd
GitHub-Pull-Request: golang/go#60484
---
M src/bufio/bufio.go
M src/bufio/bufio_test.go
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/bufio/bufio.go b/src/bufio/bufio.go
index 8469b9e..ba09d3f 100644
--- a/src/bufio/bufio.go
+++ b/src/bufio/bufio.go
@@ -70,6 +70,8 @@
// the buffered reader to read from r.
// Calling Reset on the zero value of Reader initializes the internal buffer
// to the default size.
+// If the argument io.Reader is nil, Reader initializes the internal buffer
+// to the default size.
// Calling b.Reset(b) (that is, resetting a Reader to itself) does nothing.
func (b *Reader) Reset(r io.Reader) {
// If a Reader r is passed to NewReader, NewReader will return r.
@@ -78,7 +80,7 @@
if b == r {
return
}
- if b.buf == nil {
+ if b.buf == nil || r == nil {
b.buf = make([]byte, defaultBufSize)
}
b.reset(b.buf, r)
diff --git a/src/bufio/bufio_test.go b/src/bufio/bufio_test.go
index a8c1e50..0799ed3 100644
--- a/src/bufio/bufio_test.go
+++ b/src/bufio/bufio_test.go
@@ -1514,6 +1514,12 @@
r.Reset(strings.NewReader("recur2"))
r2.Reset(r)
checkAll(r2, "recur2")
+
+ // reset the underline reader provided by the client
+ r.Reset(nil)
+ if got := r.Size(); got != DefaultBufSize {
+ t.Errorf("NewReader's Reader.Size = %d; want %d", DefaultBufSize, got)
+ }
}
func TestWriterReset(t *testing.T) {
To view, visit change 499075. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit Bot (Gerrit)
Gerrit Bot uploaded patch set #2 to this change.
bufio.Reset: when argument io.Reader is nil, Reader initializes the internal buffer to the default size
When the reset function is called with a nil argument, reset the underlying reader's buffer using the defaultBufSize.
Change-Id: Ie954fa144488a40081580000b1ba78244563171c
GitHub-Last-Rev: 1f1cc44b0a64fa379b5a187da3968f856577b2dd
GitHub-Pull-Request: golang/go#60484
---
M src/bufio/bufio.go
M src/bufio/bufio_test.go
2 files changed, 9 insertions(+), 1 deletion(-)
To view, visit change 499075. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit Bot (Gerrit)
Attention is currently required from: Brad Fitzpatrick, Ian Lance Taylor, Robert Griesemer.
Gerrit Bot uploaded patch set #3 to this change.
bufio.Reset: when argument io.Reader is nil, Reader initializes the internal buffer to the default size
When the Reset function is called with a nil argument, reset the underlying reader's buffer using the defaultBufSize.
Change-Id: Ie954fa144488a40081580000b1ba78244563171c
GitHub-Last-Rev: 1f1cc44b0a64fa379b5a187da3968f856577b2dd
GitHub-Pull-Request: golang/go#60484
---
M src/bufio/bufio.go
M src/bufio/bufio_test.go
2 files changed, 9 insertions(+), 1 deletion(-)
To view, visit change 499075. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit Bot (Gerrit)
Attention is currently required from: Brad Fitzpatrick, Ian Lance Taylor, Robert Griesemer.
Gerrit Bot uploaded patch set #4 to this change.
bufio.Reset: when argument io.Reader is nil, Reader initializes the internal buffer to the default size
When the Reset function is called with a nil argument, The underlying reader's buffer using the defaultBufSize should be reset.
Change-Id: Ie954fa144488a40081580000b1ba78244563171c
GitHub-Last-Rev: 1f1cc44b0a64fa379b5a187da3968f856577b2dd
GitHub-Pull-Request: golang/go#60484
---
M src/bufio/bufio.go
M src/bufio/bufio_test.go
2 files changed, 9 insertions(+), 1 deletion(-)
To view, visit change 499075. To unsubscribe, or for help writing mail filters, visit settings.
Ian Lance Taylor (Gerrit)
Attention is currently required from: Brad Fitzpatrick, Robert Griesemer.
1 comment:
Patchset:
I'm sorry, I don't understand this. It makes no sense to call bufio.(*Reader).Reset(nil). You wouldn't be able to do anything useful with the resulting bufio.Reader.
To view, visit change 499075. To unsubscribe, or for help writing mail filters, visit settings.
Jabar Asadi (Gerrit)
Attention is currently required from: Brad Fitzpatrick, Ian Lance Taylor, Robert Griesemer.
1 comment:
Patchset:
I'm sorry, I don't understand this. It makes no sense to call bufio.(*Reader).Reset(nil). […]
sorry. I made an error. apparently, there was a change in my master branch, caused a bug and I got confused by that.
I will close the PR.
To view, visit change 499075. To unsubscribe, or for help writing mail filters, visit settings.