From 91de77943fba3cb993aad4e9756e159c4514764a Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Mon, 25 Jun 2018 22:02:05 +0200 Subject: configfile: reduce function name stutter configfile.LoadConfFile() -> configfile.Load() configfile.CreateConfFile() -> configfile.Create() --- main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main.go') 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 } -- cgit v1.2.3