diff options
author | Jakob Unterwurzacher | 2016-01-20 20:55:56 +0100 |
---|---|---|
committer | Jakob Unterwurzacher | 2016-01-20 20:57:00 +0100 |
commit | 17f0eb13396ad31083e786ed64aef368646c2aa6 (patch) | |
tree | af6ca1565ce456d41290ca956e4209d29413509c /cryptfs/config_file.go | |
parent | b9dd9e9a1cfabd4ecf7f4d3996b0a2c24cee75b4 (diff) |
Convert logging to standard Go log.Logger
This is in preparation of logging to syslog.
Diffstat (limited to 'cryptfs/config_file.go')
-rw-r--r-- | cryptfs/config_file.go | 10 |
1 files changed, 5 insertions, 5 deletions
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 } |