vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4529 from gyuho/govet 

storage: shadowed err var fix at go-tip
release-2.3
Gyu-Ho Lee 2016-02-15 14:41:16 -08:00
parent fe5500228a 449c116a44
commit e75734aa68
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/kvstore.go
View File

@ -429,7 +429,7 @@ func (s *store) put(key, value []byte, leaseID lease.LeaseID) {
revToBytes(grev, ibytes)
_, vs := s.tx.UnsafeRange(keyBucketName, ibytes, nil, 0)
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)
}
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)
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)
}