cmd/geth, cmd/swarm: Fix to close file handler appropriately

kaneshin · kaneshin · commit 355a42f36d7e · 2017-01-30T01:10:19.000+09:00
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
@@ -123,6 +123,7 @@ func initGenesis(ctx *cli.Context) error {
 	if err != nil {
 		utils.Fatalf("failed to read genesis file: %v", err)
 	}
+	defer genesisFile.Close()
 
 	block, err := core.WriteGenesisBlock(chaindb, genesisFile)
 	if err != nil {
diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go
@@ -36,6 +36,7 @@ func hash(ctx *cli.Context) {
 		fmt.Println("Error opening file " + args[1])
 		os.Exit(1)
 	}
+	defer f.Close()
 
 	stat, _ := f.Stat()
 	chunker := storage.NewTreeChunker(storage.NewChunkerParams())

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ func initGenesis(ctx *cli.Context) error {`
`123`	`123`	`if err != nil {`
`124`	`124`	`utils.Fatalf("failed to read genesis file: %v", err)`
`125`	`125`	`}`
	`126`	`+ defer genesisFile.Close()`
`126`	`127`
`127`	`128`	`block, err := core.WriteGenesisBlock(chaindb, genesisFile)`
`128`	`129`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ func hash(ctx *cli.Context) {`
`36`	`36`	`fmt.Println("Error opening file " + args[1])`
`37`	`37`	`os.Exit(1)`
`38`	`38`	`}`
	`39`	`+ defer f.Close()`
`39`	`40`
`40`	`41`	`stat, _ := f.Stat()`
`41`	`42`	`chunker := storage.NewTreeChunker(storage.NewChunkerParams())`