diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2011-04-27 15:57:22 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2011-04-27 15:57:22 -0700 |
| commit | bb1ec0dfc8303e5fe3c1b2549d124ee2fed1faee (patch) | |
| tree | 2fe95ed893bfc3dbe51ed67641d99324d4b1b0c8 | |
| parent | 9d12307a122d263e78108173348d723bd7134479 (diff) | |
| download | go-bb1ec0dfc8303e5fe3c1b2549d124ee2fed1faee.tar.gz go-bb1ec0dfc8303e5fe3c1b2549d124ee2fed1faee.zip | |
tar: use ioutil.Discard
This one didn't come up in previous greps.
R=adg
CC=golang-dev
https://golang.org/cl/4430071
| -rw-r--r-- | src/pkg/archive/tar/reader.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/pkg/archive/tar/reader.go b/src/pkg/archive/tar/reader.go index 0cfdf355dd..ad06b6dac5 100644 --- a/src/pkg/archive/tar/reader.go +++ b/src/pkg/archive/tar/reader.go @@ -10,6 +10,7 @@ package tar import ( "bytes" "io" + "io/ioutil" "os" "strconv" ) @@ -84,12 +85,6 @@ func (tr *Reader) octal(b []byte) int64 { return int64(x) } -type ignoreWriter struct{} - -func (ignoreWriter) Write(b []byte) (n int, err os.Error) { - return len(b), nil -} - // Skip any unread bytes in the existing file entry, as well as any alignment padding. func (tr *Reader) skipUnread() { nr := tr.nb + tr.pad // number of bytes to skip @@ -99,7 +94,7 @@ func (tr *Reader) skipUnread() { return } } - _, tr.err = io.Copyn(ignoreWriter{}, tr.r, nr) + _, tr.err = io.Copyn(ioutil.Discard, tr.r, nr) } func (tr *Reader) verifyChecksum(header []byte) bool { |