From 17f0eb13396ad31083e786ed64aef368646c2aa6 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Wed, 20 Jan 2016 20:55:56 +0100
Subject: Convert logging to standard Go log.Logger

This is in preparation of logging to syslog.
---
 cryptfs/config_file.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'cryptfs/config_file.go')

diff --git a/cryptfs/config_file.go b/cryptfs/config_file.go
index 138426a..013b82d 100644
--- a/cryptfs/config_file.go
+++ b/cryptfs/config_file.go
@@ -75,17 +75,17 @@ func LoadConfFile(filename string, password string) ([]byte, *ConfFile, error) {
 	// Unmarshal
 	err = json.Unmarshal(js, &cf)
 	if err != nil {
-		Warn.Printf("Failed to unmarshal config file\n")
+		Warn.Printf("Failed to unmarshal config file")
 		return nil, nil, err
 	}
 
 	if cf.Version != HEADER_CURRENT_VERSION {
-		return nil, nil, fmt.Errorf("Unsupported on-disk format %d\n", cf.Version)
+		return nil, nil, fmt.Errorf("Unsupported on-disk format %d", cf.Version)
 	}
 
 	for _, flag := range cf.FeatureFlags {
 		if cf.isFeatureFlagKnown(flag) == false {
-			return nil, nil, fmt.Errorf("Unsupported feature flag %s\n", flag)
+			return nil, nil, fmt.Errorf("Unsupported feature flag %s", flag)
 		}
 	}
 
@@ -98,8 +98,8 @@ func LoadConfFile(filename string, password string) ([]byte, *ConfFile, error) {
 	cfs := NewCryptFS(scryptHash, false, false, false)
 	key, err := cfs.DecryptBlock(cf.EncryptedKey, 0, nil)
 	if err != nil {
-		Warn.Printf("failed to unlock master key: %s\n", err.Error())
-		Warn.Printf("Password incorrect.\n")
+		Warn.Printf("failed to unlock master key: %s", err.Error())
+		Warn.Printf("Password incorrect.")
 		return nil, nil, err
 	}
 
-- 
cgit v1.2.3