aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornick <nicholasjamesrusso@gmail.com>2016-10-31 20:49:40 -0700
committernick <nicholasjamesrusso@gmail.com>2016-10-31 20:49:40 -0700
commitac86fb9530495de6b1664bb5783c98ab905b8cfb (patch)
tree82b09d335c4719b6391855e4800b9e5c3c8e3142
parentMerge pull request #611 from jaredfolkins/master (diff)
downloaddedo-ac86fb9530495de6b1664bb5783c98ab905b8cfb.tar.gz
dedo-ac86fb9530495de6b1664bb5783c98ab905b8cfb.tar.xz
Fix return statement inside else block at the end of function and gofmt windows file
Signed-off-by: nick <nicholasjamesrusso@gmail.com>
-rw-r--r--bolt_windows.go2
-rw-r--r--bucket.go3
2 files changed, 2 insertions, 3 deletions
diff --git a/bolt_windows.go b/bolt_windows.go
index d538e6a..b00fb07 100644
--- 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
index 511ce72..0c5bf27 100644
--- 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.