qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-20 03:54:40 -07:00
Code Releases Activity

tar: use ioutil.Discard

Browse Source 
This one didn't come up in previous greps.

R=adg
CC=golang-dev
https://golang.org/cl/4430071
This commit is contained in:
Brad Fitzpatrick 2011-04-27 15:57:22 -07:00
parent 9d12307a12
commit bb1ec0dfc8
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pkg/archive/tar/reader.go
View File

@ -10,6 +10,7 @@ package tar
import ( import (
"bytes" "bytes"
"io" "io"
"io/ioutil"
"os" "os"
"strconv" "strconv"
) )
@ -84,12 +85,6 @@ func (tr *Reader) octal(b []byte) int64 {
return int64(x) 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. // Skip any unread bytes in the existing file entry, as well as any alignment padding.
func (tr *Reader) skipUnread() { func (tr *Reader) skipUnread() {
nr := tr.nb + tr.pad // number of bytes to skip nr := tr.nb + tr.pad // number of bytes to skip
@ -99,7 +94,7 @@ func (tr *Reader) skipUnread() {
return 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 { func (tr *Reader) verifyChecksum(header []byte) bool {