From: Stanislav Afanasev <php.progger@gmail.com>
Date: Tue, 7 Nov 2017 19:43:44 +0000 (+0300)
Subject: archive/tar: a cosmetic fix after checking by golint
X-Git-Tag: go1.10beta1~360
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a4aa5c31811b13b5d16b6fbbb2c72ed53eca0efb;p=gostls13.git

archive/tar: a cosmetic fix after checking by golint

Existing methods regFileReader.LogicalRemaining and regFileReader.PhysicalRemaining have inconsistent reciever names with the previous name

Change-Id: Ief2024716737eaf482c4311f3fdf77d92801c36e
Reviewed-on: https://go-review.googlesource.com/76430
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
Run-TryBot: Joe Tsai <thebrokentoaster@gmail.com>
---

diff --git a/src/archive/tar/reader.go b/src/archive/tar/reader.go
index 6bb2c46e7b..1d0673020f 100644
--- a/src/archive/tar/reader.go
+++ b/src/archive/tar/reader.go
@@ -238,9 +238,8 @@ func (tr *Reader) readGNUSparsePAXHeaders(hdr *Header) (sparseDatas, error) {
 	// Read the sparse map according to the appropriate format.
 	if is1x0 {
 		return readGNUSparseMap1x0(tr.curr)
-	} else {
-		return readGNUSparseMap0x1(hdr.PAXRecords)
 	}
+	return readGNUSparseMap0x1(hdr.PAXRecords)
 }
 
 // mergePAX merges paxHdrs into hdr for all relevant fields of Header.
@@ -674,11 +673,12 @@ func (fr *regFileReader) WriteTo(w io.Writer) (int64, error) {
 	return io.Copy(w, struct{ io.Reader }{fr})
 }
 
-func (rf regFileReader) LogicalRemaining() int64 {
-	return rf.nb
+func (fr regFileReader) LogicalRemaining() int64 {
+	return fr.nb
 }
-func (rf regFileReader) PhysicalRemaining() int64 {
-	return rf.nb
+
+func (fr regFileReader) PhysicalRemaining() int64 {
+	return fr.nb
 }
 
 // sparseFileReader is a fileReader for reading data from a sparse file entry.