diff options
| author | Ben Johnson <benbjohnson@yahoo.com> | 2016-12-27 14:08:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-27 14:08:26 -0700 |
| commit | 2c3edd782c07f917541f3094a42149bd7e497dc2 (patch) | |
| tree | 1dcce56aef3c19abcb170373470a85277dd091b6 | |
| parent | Merge pull request #625 from vrecan/FcntlFlock (diff) | |
| parent | Fix return statement inside else block at the end of function and gofmt windo... (diff) | |
| download | dedo-2c3edd782c07f917541f3094a42149bd7e497dc2.tar.gz dedo-2c3edd782c07f917541f3094a42149bd7e497dc2.tar.xz | |
Merge pull request #616 from sinwav/idiomatic
Fix return statement inside else block at the end of function
| -rw-r--r-- | bolt_windows.go | 2 | ||||
| -rw-r--r-- | bucket.go | 3 |
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 } @@ -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. |