summaryrefslogtreecommitdiff
path: root/main.go
diff options
context:
space:
mode:
authorJakob Unterwurzacher2018-06-25 22:02:05 +0200
committerJakob Unterwurzacher2018-07-01 20:56:22 +0200
commit91de77943fba3cb993aad4e9756e159c4514764a (patch)
tree7cc07a23ec031e93b0c896b4541a94beaed46aee /main.go
parent8e5ca7299a3292cae64418aaf875819c2cca01f5 (diff)
configfile: reduce function name stutter
configfile.LoadConfFile() -> configfile.Load() configfile.CreateConfFile() -> configfile.Create()
Diffstat (limited to 'main.go')
-rw-r--r--main.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.go b/main.go
index 9fdbc6e..da5360b 100644
--- a/main.go
+++ b/main.go
@@ -35,7 +35,7 @@ var raceDetector bool
func loadConfig(args *argContainer) (masterkey []byte, confFile *configfile.ConfFile, err error) {
// First check if the file can be read at all, and find out if a Trezor should
// be used instead of a password.
- _, cf1, err := configfile.LoadConfFile(args.config, nil)
+ _, cf1, err := configfile.Load(args.config, nil)
if err != nil {
tlog.Fatal.Printf("Cannot open config file: %v", err)
return nil, nil, err
@@ -55,7 +55,7 @@ func loadConfig(args *argContainer) (masterkey []byte, confFile *configfile.Conf
pw = readpassword.Once(args.extpass, "")
}
tlog.Info.Println("Decrypting master key")
- masterkey, confFile, err = configfile.LoadConfFile(args.config, pw)
+ masterkey, confFile, err = configfile.Load(args.config, pw)
for i := range pw {
pw[i] = 0
}