Merge pull request boltdb#616 from sinwav/idiomatic

benbjohnson · web-flow · commit 2c3edd782c07 · 2016-12-27T14:08:26.000-07:00
Fix return statement inside else block at the end of function
diff --git a/bolt_windows.go b/bolt_windows.go
@@ -89,7 +89,7 @@ func flock(db *DB, mode os.FileMode, exclusive bool, timeout time.Duration) erro
 func funlock(db *DB) error {
 	err := unlockFileEx(syscall.Handle(db.lockfile.Fd()), 0, 1, 0, &syscall.Overlapped{})
 	db.lockfile.Close()
-	os.Remove(db.path+lockExt)
+	os.Remove(db.path + lockExt)
 	return err
 }
 
diff --git a/bucket.go b/bucket.go
@@ -175,9 +175,8 @@ func (b *Bucket) CreateBucket(key []byte) (*Bucket, error) {
 	if bytes.Equal(key, k) {
 		if (flags & bucketLeafFlag) != 0 {
 			return nil, ErrBucketExists
-		} else {
-			return nil, ErrIncompatibleValue
 		}
+		return nil, ErrIncompatibleValue
 	}
 
 	// Create empty, inline bucket.

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func flock(db *DB, mode os.FileMode, exclusive bool, timeout time.Duration) erro`
`89`	`89`	`func funlock(db *DB) error {`
`90`	`90`	`err := unlockFileEx(syscall.Handle(db.lockfile.Fd()), 0, 1, 0, &syscall.Overlapped{})`
`91`	`91`	`db.lockfile.Close()`
`92`		`- os.Remove(db.path+lockExt)`
	`92`	`+ os.Remove(db.path + lockExt)`
`93`	`93`	`return err`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -175,9 +175,8 @@ func (b Bucket) CreateBucket(key []byte) (Bucket, error) {`
`175`	`175`	`if bytes.Equal(key, k) {`
`176`	`176`	`if (flags & bucketLeafFlag) != 0 {`
`177`	`177`	`return nil, ErrBucketExists`
`178`		`- } else {`
`179`		`- return nil, ErrIncompatibleValue`
`180`	`178`	`}`
	`179`	`+ return nil, ErrIncompatibleValue`
`181`	`180`	`}`
`182`	`181`
`183`	`182`	`// Create empty, inline bucket.`