From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Wed, 27 Apr 2011 22:57:22 +0000 (-0700)
Subject: tar: use ioutil.Discard
X-Git-Tag: weekly.2011-04-27~9
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=bb1ec0dfc8303e5fe3c1b2549d124ee2fed1faee;p=gostls13.git

tar: use ioutil.Discard

This one didn't come up in previous greps.

R=adg
CC=golang-dev
https://golang.org/cl/4430071
---

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 {