From 984f95ae1722b48589c0c66d66819ae1383d0755 Mon Sep 17 00:00:00 2001
From: Albert Strasheim <albert@cloudflare.com>
Date: Tue, 26 Nov 2013 11:34:16 -0800
Subject: [PATCH] Tweak error returns to work with older Go.

Fixes #14
---
 passvault/passvault.go | 14 +++++++-------
 redoctober.go          |  5 ++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/passvault/passvault.go b/passvault/passvault.go
index 18e33b1..ce31e84 100644
--- a/passvault/passvault.go
+++ b/passvault/passvault.go
@@ -330,21 +330,21 @@ func WriteRecordsToDisk() error {
 		return errors.New("Path not initialized")
 	}
 
-	if jsonDiskRecord, err := json.Marshal(records); err == nil {
-		return ioutil.WriteFile(localPath, jsonDiskRecord, 0644)
-	} else {
+	jsonDiskRecord, err := json.Marshal(records)
+	if err != nil {
 		return err
 	}
+	return ioutil.WriteFile(localPath, jsonDiskRecord, 0644)
 }
 
 // AddNewRecord adds a new record for a given username and password.
 func AddNewRecord(name, password string, admin bool) (PasswordRecord, error) {
-	if pr, err := createPasswordRec(password, admin); err == nil {
-		SetRecord(pr, name)
-		return pr, WriteRecordsToDisk()
-	} else {
+	pr, err := createPasswordRec(password, admin)
+	if err != nil {
 		return pr, err
 	}
+	SetRecord(pr, name)
+	return pr, WriteRecordsToDisk()
 }
 
 // ChangePassword changes the password for a given user.
diff --git a/redoctober.go b/redoctober.go
index fd53a20..0f49bf3 100644
--- a/redoctober.go
+++ b/redoctober.go
@@ -201,9 +201,8 @@ func main() {
 	}()
 
 	s, l, err := NewServer(process, *staticPath, *addr, *certPath, *keyPath, *caPath)
-	if err == nil {
-		s.Serve(*l)
-	} else {
+	if err != nil {
 		log.Fatalf("Error starting redoctober server: %s\n", err)
 	}
+	s.Serve(*l)
 }