From 97a87d7eccdff1ea1a86d4035fb294ecabc308c9 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Thu, 9 Feb 2017 13:29:56 +0000 Subject: [PATCH] make for loops consistent --- src/github.com/matrix-org/dendrite/roomserver/storage/sql.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/sql.go b/src/github.com/matrix-org/dendrite/roomserver/storage/sql.go index a93ded15d..5742c87fd 100644 --- a/src/github.com/matrix-org/dendrite/roomserver/storage/sql.go +++ b/src/github.com/matrix-org/dendrite/roomserver/storage/sql.go @@ -478,11 +478,10 @@ func (s *statements) selectEventJSONs(eventNIDs []int64) ([]eventJSONPair, error // We might get fewer results than NIDs so we adjust the length of the slice before returning it. results := make([]eventJSONPair, len(eventNIDs)) i := 0 - for rows.Next() { + for ; rows.Next(); i++ { if err := rows.Scan(&results[i].EventNID, &results[i].EventJSON); err != nil { return nil, err } - i++ } return results[:i], nil }