lib: Use bytes.Equal instead of bytes.Compare where possible

This commit is contained in:
Jakob Borg
2016-03-31 15:12:46 +00:00
committed by Audrius Butkevicius
parent b6f32b6e45
commit f5f0e46016
8 changed files with 21 additions and 21 deletions

View File

@@ -454,7 +454,7 @@ nextFile:
need := false // If we have a lower version of the file
var haveVersion protocol.Vector
for _, v := range vl.versions {
if bytes.Compare(v.device, device) == 0 {
if bytes.Equal(v.device, device) {
have = true
haveVersion = v.version
// XXX: This marks Concurrent (i.e. conflicting) changes as
@@ -550,7 +550,7 @@ func (db *Instance) dropFolder(folder []byte) {
dbi := t.NewIterator(util.BytesPrefix([]byte{KeyTypeDevice}), nil)
for dbi.Next() {
itemFolder := db.deviceKeyFolder(dbi.Key())
if bytes.Compare(folder, itemFolder) == 0 {
if bytes.Equal(folder, itemFolder) {
db.Delete(dbi.Key(), nil)
}
}
@@ -560,7 +560,7 @@ func (db *Instance) dropFolder(folder []byte) {
dbi = t.NewIterator(util.BytesPrefix([]byte{KeyTypeGlobal}), nil)
for dbi.Next() {
itemFolder := db.globalKeyFolder(dbi.Key())
if bytes.Compare(folder, itemFolder) == 0 {
if bytes.Equal(folder, itemFolder) {
db.Delete(dbi.Key(), nil)
}
}

View File

@@ -23,15 +23,15 @@ func TestDeviceKey(t *testing.T) {
key := db.deviceKey(fld, dev, name)
fld2 := db.deviceKeyFolder(key)
if bytes.Compare(fld2, fld) != 0 {
if !bytes.Equal(fld2, fld) {
t.Errorf("wrong folder %q != %q", fld2, fld)
}
dev2 := db.deviceKeyDevice(key)
if bytes.Compare(dev2, dev) != 0 {
if !bytes.Equal(dev2, dev) {
t.Errorf("wrong device %q != %q", dev2, dev)
}
name2 := db.deviceKeyName(key)
if bytes.Compare(name2, name) != 0 {
if !bytes.Equal(name2, name) {
t.Errorf("wrong name %q != %q", name2, name)
}
}
@@ -46,11 +46,11 @@ func TestGlobalKey(t *testing.T) {
key := db.globalKey(fld, name)
fld2 := db.globalKeyFolder(key)
if bytes.Compare(fld2, fld) != 0 {
if !bytes.Equal(fld2, fld) {
t.Errorf("wrong folder %q != %q", fld2, fld)
}
name2 := db.globalKeyName(key)
if bytes.Compare(name2, name) != 0 {
if !bytes.Equal(name2, name) {
t.Errorf("wrong name %q != %q", name2, name)
}
}

View File

@@ -107,7 +107,7 @@ func (t readWriteTransaction) updateGlobal(folder, device []byte, file protocol.
}
for i := range fl.versions {
if bytes.Compare(fl.versions[i].device, device) == 0 {
if bytes.Equal(fl.versions[i].device, device) {
if fl.versions[i].version.Equal(file.Version) {
// No need to do anything
return false
@@ -213,7 +213,7 @@ func (t readWriteTransaction) removeFromGlobal(folder, device, file []byte, glob
removed := false
for i := range fl.versions {
if bytes.Compare(fl.versions[i].device, device) == 0 {
if bytes.Equal(fl.versions[i].device, device) {
if i == 0 && globalSize != nil {
f, ok := t.getFile(folder, device, file)
if !ok {