From adff0f3813b93bf5c744997eeb7c7c3fc91e5fed Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 8 Sep 2014 15:36:25 -0700 Subject: [PATCH] wal: named return values for ReadAll. --- wal/wal.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/wal/wal.go b/wal/wal.go index b8d5540a5..1d90de007 100644 --- a/wal/wal.go +++ b/wal/wal.go @@ -141,14 +141,10 @@ func OpenFromIndex(dirpath string, index int64) (*WAL, error) { // ReadAll reads out all records of the current WAL. // After ReadAll, the WAL will be ready for appending new records. -func (w *WAL) ReadAll() (int64, raftpb.State, []raftpb.Entry, error) { - var id int64 - var state raftpb.State - var entries []raftpb.Entry - +func (w *WAL) ReadAll() (id int64, state raftpb.State, entries []raftpb.Entry, err error) { rec := &walpb.Record{} decoder := w.decoder - var err error + for err = decoder.decode(rec); err == nil; err = decoder.decode(rec) { switch rec.Type { case entryType: