From 449c116a444901ed8e1ac4bb1fe8c4d5c422c1e1 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Sun, 14 Feb 2016 19:49:03 -0800 Subject: [PATCH] storage: shadowed err var fix at go-tip --- storage/kvstore.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/kvstore.go b/storage/kvstore.go index 200426f5c..238715484 100644 --- a/storage/kvstore.go +++ b/storage/kvstore.go @@ -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) }