From bd6228197a60b9fa5ab56dfae52551aef6e1e0c3 Mon Sep 17 00:00:00 2001
From: teru <teru@kteru.net>
Date: Thu, 18 Aug 2016 19:22:54 +0900
Subject: [PATCH] cosmetic changes

---
 cmd/mailfull/command/usercheckpw.go |  6 +++---
 cmd/mailfull/command/userpasswd.go  | 18 +++++++++---------
 repository.go                       |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cmd/mailfull/command/usercheckpw.go b/cmd/mailfull/command/usercheckpw.go
index 6fd8e37..66d93af 100644
--- a/cmd/mailfull/command/usercheckpw.go
+++ b/cmd/mailfull/command/usercheckpw.go
@@ -81,9 +81,9 @@ func (c *UserCheckPwCommand) Run(args []string) int {
 	}
 
 	if len(args) != 2 {
-		input, err1 := c.UI.AskSecret(fmt.Sprintf("Enter password for %s:", address))
-		if err1 != nil {
-			fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err1)
+		input, err := c.UI.AskSecret(fmt.Sprintf("Enter password for %s:", address))
+		if err != nil {
+			fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)
 			return 1
 		}
 
diff --git a/cmd/mailfull/command/userpasswd.go b/cmd/mailfull/command/userpasswd.go
index 5f5be57..ea568d8 100644
--- a/cmd/mailfull/command/userpasswd.go
+++ b/cmd/mailfull/command/userpasswd.go
@@ -81,14 +81,14 @@ func (c *UserPasswdCommand) Run(args []string) int {
 	}
 
 	if len(args) != 2 {
-		input1, err1 := c.UI.AskSecret(fmt.Sprintf("Enter new password for %s:", address))
-		if err1 != nil {
-			fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err1)
+		input1, err := c.UI.AskSecret(fmt.Sprintf("Enter new password for %s:", address))
+		if err != nil {
+			fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)
 			return 1
 		}
-		input2, err2 := c.UI.AskSecret("Retype new password:")
-		if err2 != nil {
-			fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err2)
+		input2, err := c.UI.AskSecret("Retype new password:")
+		if err != nil {
+			fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)
 			return 1
 		}
 		if input1 != input2 {
@@ -100,9 +100,9 @@ func (c *UserPasswdCommand) Run(args []string) int {
 
 	hashedPassword := mailfull.NeverMatchHashedPassword
 	if rawPassword != "" {
-		str, errHash := ssha.Generate(rawPassword, 4)
-		if errHash != nil {
-			fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", errHash)
+		str, err := ssha.Generate(rawPassword, 4)
+		if err != nil {
+			fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)
 			return 1
 		}
 		hashedPassword = str
diff --git a/repository.go b/repository.go
index a1e27dd..187c997 100644
--- a/repository.go
+++ b/repository.go
@@ -126,10 +126,10 @@ func OpenRepository(basePath string) (*Repository, error) {
 	for {
 		configDirPath := filepath.Join(rootPath, DirNameConfig)
 
-		fi, errStat := os.Stat(configDirPath)
-		if errStat != nil {
-			if errStat.(*os.PathError).Err != syscall.ENOENT {
-				return nil, errStat
+		fi, err := os.Stat(configDirPath)
+		if err != nil {
+			if err.(*os.PathError).Err != syscall.ENOENT {
+				return nil, err
 			}
 		} else {
 			if fi.IsDir() {