dbconf: cleaning, no need to declare several error variables

dbconf.go

@@ -3,8 +3,8 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/lib/pq"
 	"github.com/kylelemons/go-gypsy/yaml"
+	"github.com/lib/pq"
 	"os"
 	"path/filepath"
 )
@@ -35,23 +35,23 @@ func makeDBConfDetails(p, env string) (*DBConf, error) {
 		return nil, err
 	}
 
-	drv, derr := f.Get(fmt.Sprintf("%s.driver", env))
-	if derr != nil {
-		return nil, derr
+	drv, err := f.Get(fmt.Sprintf("%s.driver", env))
+	if err != nil {
+		return nil, err
 	}
 
-	open, oerr := f.Get(fmt.Sprintf("%s.open", env))
-	if oerr != nil {
-		return nil, oerr
+	open, err := f.Get(fmt.Sprintf("%s.open", env))
+	if err != nil {
+		return nil, err
 	}
 	open = os.ExpandEnv(open)
 
 	// Automatically parse postgres urls
 	if drv == "postgres" {
-		parsed_open, parse_err := pq.ParseURL(open)
+
 		// Assumption: If we can parse the URL, we should
-		if parse_err == nil && parsed_open != "" {
-			open = parsed_open
+		if parsedURL, err := pq.ParseURL(open); err == nil && parsedURL != "" {
+			open = parsedURL
 		}
 	}