From cd1a7dc23e9524fe42863fd0e1b25c249a12148e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 31 Mar 2015 16:44:39 +0200
Subject: [PATCH] Fix some golint warnings

---
 fs/fs.go           |  3 +--
 mtp/device_test.go | 60 ++++++++++++++++++++++------------------------
 mtp/encoding.go    |  4 ++--
 3 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/fs/fs.go b/fs/fs.go
index 14bad0e..57ae54c 100644
--- a/fs/fs.go
+++ b/fs/fs.go
@@ -419,9 +419,8 @@ func (n *folderNode) Rename(oldName string, newParent nodefs.Node, newName strin
 			// TODO - delete destination?
 			log.Printf("old folder already has child %q", newName)
 			return fuse.ENOSYS
-		} else {
-			// does mtp overwrite the destination?
 		}
+		// does mtp overwrite the destination?
 	}
 
 	if fn != n {
diff --git a/mtp/device_test.go b/mtp/device_test.go
index 8cd3d35..8957207 100644
--- a/mtp/device_test.go
+++ b/mtp/device_test.go
@@ -98,26 +98,25 @@ func TestAndroid(t *testing.T) {
 	if err != nil {
 		t.Errorf("AndroidBeginEditObject: %v", err)
 		return
-	} else {
-		err = dev.AndroidTruncate(handle, int64(magicSize))
-		if err != nil {
-			t.Errorf("AndroidTruncate: %v", err)
-		}
-		buf := bytes.NewBufferString(magicStr)
-		err = dev.AndroidSendPartialObject(handle, int64(magicOff), uint32(buf.Len()), buf)
-		if err != nil {
-			t.Errorf("AndroidSendPartialObject: %v", err)
-		}
-		if buf.Len() > 0 {
-			t.Errorf("buffer not consumed")
-		}
-		err = dev.AndroidEndEditObject(handle)
-		if err != nil {
-			t.Errorf("AndroidEndEditObject: %v", err)
-		}
+	}
+	err = dev.AndroidTruncate(handle, int64(magicSize))
+	if err != nil {
+		t.Errorf("AndroidTruncate: %v", err)
+	}
+	buf := bytes.NewBufferString(magicStr)
+	err = dev.AndroidSendPartialObject(handle, int64(magicOff), uint32(buf.Len()), buf)
+	if err != nil {
+		t.Errorf("AndroidSendPartialObject: %v", err)
+	}
+	if buf.Len() > 0 {
+		t.Errorf("buffer not consumed")
+	}
+	err = dev.AndroidEndEditObject(handle)
+	if err != nil {
+		t.Errorf("AndroidEndEditObject: %v", err)
 	}
 
-	buf := &bytes.Buffer{}
+	buf = &bytes.Buffer{}
 	err = dev.GetObject(handle, buf)
 	if err != nil {
 		t.Errorf("GetObject: %v", err)
@@ -150,19 +149,18 @@ func TestAndroid(t *testing.T) {
 	if err != nil {
 		t.Errorf("AndroidBeginEditObject: %v", err)
 		return
-	} else {
-		buf := bytes.NewBufferString(magicStr)
-		err = dev.AndroidSendPartialObject(handle, int64(magicSize), uint32(buf.Len()), buf)
-		if err != nil {
-			t.Errorf("AndroidSendPartialObject: %v", err)
-		}
-		if buf.Len() > 0 {
-			t.Errorf("buffer not consumed")
-		}
-		err = dev.AndroidEndEditObject(handle)
-		if err != nil {
-			t.Errorf("AndroidEndEditObject: %v", err)
-		}
+	}
+	buf = bytes.NewBufferString(magicStr)
+	err = dev.AndroidSendPartialObject(handle, int64(magicSize), uint32(buf.Len()), buf)
+	if err != nil {
+		t.Errorf("AndroidSendPartialObject: %v", err)
+	}
+	if buf.Len() > 0 {
+		t.Errorf("buffer not consumed")
+	}
+	err = dev.AndroidEndEditObject(handle)
+	if err != nil {
+		t.Errorf("AndroidEndEditObject: %v", err)
 	}
 	buf = &bytes.Buffer{}
 	err = dev.GetObject(handle, buf)
diff --git a/mtp/encoding.go b/mtp/encoding.go
index 24308f8..65bb5f8 100644
--- a/mtp/encoding.go
+++ b/mtp/encoding.go
@@ -197,11 +197,11 @@ func encodeTime(w io.Writer, f reflect.Value) error {
 	}
 
 	out := make([]byte, 2*len(s)+3)
-	out, err := encodeStr(out, s)
+	enc, err := encodeStr(out, s)
 	if err != nil {
 		return err
 	}
-	_, err = w.Write(out)
+	_, err = w.Write(enc)
 	return err
 }