hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

main: pull regular exits into main function

Browse Source 
The replaces the "does not return" comments with
an explicit os.Exit, which is unambigous.
This commit is contained in:
Jakob Unterwurzacher 2018-04-01 12:12:47 +02:00
parent 1a3d04ab87
commit 5da5e467a6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
info.go
View File

@ -41,5 +41,4 @@ func info(filename string) {
s := cf.ScryptObject s := cf.ScryptObject
fmt.Printf("ScryptObject: Salt=%dB N=%d R=%d P=%d KeyLen=%d\n", fmt.Printf("ScryptObject: Salt=%dB N=%d R=%d P=%d KeyLen=%d\n",
len(s.Salt), s.N, s.R, s.P, s.KeyLen) len(s.Salt), s.N, s.R, s.P, s.KeyLen)
os.Exit(0)
} }

1
init_dir.go
View File

@ -79,5 +79,4 @@ func initDir(args *argContainer) {
} }
tlog.Info.Printf(tlog.ColorGrey+"You can now mount it using: %s%s %s MOUNTPOINT"+tlog.ColorReset, tlog.Info.Printf(tlog.ColorGrey+"You can now mount it using: %s%s %s MOUNTPOINT"+tlog.ColorReset,
tlog.ProgramName, mountArgs, friendlyPath) tlog.ProgramName, mountArgs, friendlyPath)
os.Exit(0)
} }

10
main.go
View File

@ -103,7 +103,6 @@ func changePassword(args *argContainer) {
os.Exit(exitcodes.WriteConf) os.Exit(exitcodes.WriteConf)
} }
tlog.Info.Printf(tlog.ColorGreen + "Password changed." + tlog.ColorReset) tlog.Info.Printf(tlog.ColorGreen + "Password changed." + tlog.ColorReset)
os.Exit(0)
} }
// printVersion prints a version string like this: // printVersion prints a version string like this:
@ -257,7 +256,8 @@ func main() {
tlog.Fatal.Printf("Usage: %s -info CIPHERDIR", tlog.ProgramName) tlog.Fatal.Printf("Usage: %s -info CIPHERDIR", tlog.ProgramName)
os.Exit(exitcodes.Usage) os.Exit(exitcodes.Usage)
} }
info(args.config) // does not return info(args.config)
os.Exit(0)
} }
// "-init" // "-init"
if args.init { if args.init {
@ -265,7 +265,8 @@ func main() {
tlog.Fatal.Printf("Usage: %s -init [OPTIONS] CIPHERDIR", tlog.ProgramName) tlog.Fatal.Printf("Usage: %s -init [OPTIONS] CIPHERDIR", tlog.ProgramName)
os.Exit(exitcodes.Usage) os.Exit(exitcodes.Usage)
} }
initDir(&args) // does not return initDir(&args)
os.Exit(0)
} }
// "-passwd" // "-passwd"
if args.passwd { if args.passwd {
@ -273,7 +274,8 @@ func main() {
tlog.Fatal.Printf("Usage: %s -passwd [OPTIONS] CIPHERDIR", tlog.ProgramName) tlog.Fatal.Printf("Usage: %s -passwd [OPTIONS] CIPHERDIR", tlog.ProgramName)
os.Exit(exitcodes.Usage) os.Exit(exitcodes.Usage)
} }
changePassword(&args) // does not return changePassword(&args)
os.Exit(0)
} }
// Default operation: mount. // Default operation: mount.
if flagSet.NArg() != 2 { if flagSet.NArg() != 2 {