mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Merge pull request #4529 from gyuho/govet
storage: shadowed err var fix at go-tip
This commit is contained in:
commit
e75734aa68
@ -429,7 +429,7 @@ func (s *store) put(key, value []byte, leaseID lease.LeaseID) {
|
|||||||
revToBytes(grev, ibytes)
|
revToBytes(grev, ibytes)
|
||||||
_, vs := s.tx.UnsafeRange(keyBucketName, ibytes, nil, 0)
|
_, vs := s.tx.UnsafeRange(keyBucketName, ibytes, nil, 0)
|
||||||
var kv storagepb.KeyValue
|
var kv storagepb.KeyValue
|
||||||
if err := kv.Unmarshal(vs[0]); err != nil {
|
if err = kv.Unmarshal(vs[0]); err != nil {
|
||||||
log.Fatalf("storage: cannot unmarshal value: %v", err)
|
log.Fatalf("storage: cannot unmarshal value: %v", err)
|
||||||
}
|
}
|
||||||
oldLease = lease.LeaseID(kv.Lease)
|
oldLease = lease.LeaseID(kv.Lease)
|
||||||
@ -527,7 +527,7 @@ func (s *store) delete(key []byte, rev revision) {
|
|||||||
_, vs := s.tx.UnsafeRange(keyBucketName, ibytes, nil, 0)
|
_, vs := s.tx.UnsafeRange(keyBucketName, ibytes, nil, 0)
|
||||||
|
|
||||||
kv.Reset()
|
kv.Reset()
|
||||||
if err := kv.Unmarshal(vs[0]); err != nil {
|
if err = kv.Unmarshal(vs[0]); err != nil {
|
||||||
log.Fatalf("storage: cannot unmarshal value: %v", err)
|
log.Fatalf("storage: cannot unmarshal value: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user