From 6f2b4b96cff67b87dde1db65072b576d5385aea5 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Sat, 17 Jan 2015 21:01:55 +0100
Subject: [PATCH] Refactor: use leveldb/util.BytesPrefix

---
 internal/db/leveldb.go | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/internal/db/leveldb.go b/internal/db/leveldb.go
index 775b273ec..34f2e465b 100644
--- a/internal/db/leveldb.go
+++ b/internal/db/leveldb.go
@@ -901,8 +901,6 @@ outer:
 func ldbListFolders(db *leveldb.DB) []string {
 	runtime.GC()
 
-	start := []byte{keyTypeGlobal}
-	limit := []byte{keyTypeGlobal + 1}
 	snap, err := db.GetSnapshot()
 	if err != nil {
 		panic(err)
@@ -917,7 +915,7 @@ func ldbListFolders(db *leveldb.DB) []string {
 		snap.Release()
 	}()
 
-	dbi := snap.NewIterator(&util.Range{Start: start, Limit: limit}, nil)
+	dbi := snap.NewIterator(util.BytesPrefix([]byte{keyTypeGlobal}), nil)
 	defer dbi.Release()
 
 	folderExists := make(map[string]bool)
@@ -955,9 +953,7 @@ func ldbDropFolder(db *leveldb.DB, folder []byte) {
 	}()
 
 	// Remove all items related to the given folder from the device->file bucket
-	start := []byte{keyTypeDevice}
-	limit := []byte{keyTypeDevice + 1}
-	dbi := snap.NewIterator(&util.Range{Start: start, Limit: limit}, nil)
+	dbi := snap.NewIterator(util.BytesPrefix([]byte{keyTypeDevice}), nil)
 	for dbi.Next() {
 		itemFolder := deviceKeyFolder(dbi.Key())
 		if bytes.Compare(folder, itemFolder) == 0 {
@@ -967,9 +963,7 @@ func ldbDropFolder(db *leveldb.DB, folder []byte) {
 	dbi.Release()
 
 	// Remove all items related to the given folder from the global bucket
-	start = []byte{keyTypeGlobal}
-	limit = []byte{keyTypeGlobal + 1}
-	dbi = snap.NewIterator(&util.Range{Start: start, Limit: limit}, nil)
+	dbi = snap.NewIterator(util.BytesPrefix([]byte{keyTypeGlobal}), nil)
 	for dbi.Next() {
 		itemFolder := globalKeyFolder(dbi.Key())
 		if bytes.Compare(folder, itemFolder) == 0 {