From 393e531afd64ad6c5d1db4c36312a29233c8d3f2 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher <jakobunt@gmail.com>
Date: Tue, 14 Jun 2016 22:45:33 +0200
Subject: [PATCH] Fix warnings reported by Go 1.6 "go tool vet -shadow=true"

Warnings were:

  main.go:234: declaration of err shadows declaration at main.go:163:
  internal/fusefrontend/file.go:401: declaration of err shadows declaration at internal/fusefrontend/file.go:379:
  internal/fusefrontend/file.go:419: declaration of err shadows declaration at internal/fusefrontend/file.go:379:
  internal/fusefrontend/fs_dir.go:140: declaration of err shadows declaration at internal/fusefrontend/fs_dir.go:97:
---
 internal/fusefrontend/file.go   | 7 ++++---
 internal/fusefrontend/fs_dir.go | 2 +-
 main.go                         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/internal/fusefrontend/file.go b/internal/fusefrontend/file.go
index 62303df..96a07fc 100644
--- a/internal/fusefrontend/file.go
+++ b/internal/fusefrontend/file.go
@@ -361,10 +361,11 @@ func (f *file) Truncate(newSize uint64) fuse.Status {
 	}
 	wlock.lock(f.ino)
 	defer wlock.unlock(f.ino)
+	var err error
 
 	// Common case first: Truncate to zero
 	if newSize == 0 {
-		err := syscall.Ftruncate(int(f.fd.Fd()), 0)
+		err = syscall.Ftruncate(int(f.fd.Fd()), 0)
 		if err != nil {
 			toggledlog.Warn.Printf("ino%d fh%d: Ftruncate(fd, 0) returned error: %v", f.ino, f.intFd(), err)
 			return fuse.ToStatus(err)
@@ -398,7 +399,7 @@ func (f *file) Truncate(newSize uint64) fuse.Status {
 
 		// File was empty, create new header
 		if oldSize == 0 {
-			err := f.createHeader()
+			err = f.createHeader()
 			if err != nil {
 				return fuse.ToStatus(err)
 			}
@@ -416,7 +417,7 @@ func (f *file) Truncate(newSize uint64) fuse.Status {
 				}
 			} else {
 				off, length := b.CiphertextRange()
-				err := syscall.Ftruncate(int(f.fd.Fd()), int64(off+length))
+				err = syscall.Ftruncate(int(f.fd.Fd()), int64(off+length))
 				if err != nil {
 					toggledlog.Warn.Printf("grow Ftruncate returned error: %v", err)
 					return fuse.ToStatus(err)
diff --git a/internal/fusefrontend/fs_dir.go b/internal/fusefrontend/fs_dir.go
index e946087..b7d33ff 100644
--- a/internal/fusefrontend/fs_dir.go
+++ b/internal/fusefrontend/fs_dir.go
@@ -137,7 +137,7 @@ func (fs *FS) Rmdir(path string, context *fuse.Context) (code fuse.Status) {
 		// Undo the chmod if removing the directory failed
 		defer func() {
 			if code != fuse.OK {
-				err := os.Chmod(cPath, origMode)
+				err = os.Chmod(cPath, origMode)
 				if err != nil {
 					toggledlog.Warn.Printf("Rmdir: Chmod rollback failed: %v", err)
 				}
diff --git a/main.go b/main.go
index 404b1ef..6896f11 100644
--- a/main.go
+++ b/main.go
@@ -231,7 +231,7 @@ func main() {
 	// Every operation below requires CIPHERDIR. Check that we have it.
 	if flagSet.NArg() >= 1 {
 		args.cipherdir, _ = filepath.Abs(flagSet.Arg(0))
-		err := checkDir(args.cipherdir)
+		err = checkDir(args.cipherdir)
 		if err != nil {
 			toggledlog.Fatal.Printf(colorRed+"Invalid cipherdir: %v\n"+colorReset, err)
 			os.Exit(ERREXIT_CIPHERDIR)