From 2da24364f5eb90fa53cf92aa353152dbe53819a4 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 1 Oct 2019 22:26:33 +0200
Subject: ringlogger: simplify

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 ringlogger/ringlogger.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ringlogger/ringlogger.go b/ringlogger/ringlogger.go
index 46d6d072..fe88fdc7 100644
--- a/ringlogger/ringlogger.go
+++ b/ringlogger/ringlogger.go
@@ -144,15 +144,13 @@ func (rl *Ringlogger) WriteTo(out io.Writer) (n int64, err error) {
 	}
 	log := *rl.log
 	i := log.nextIndex
-	for l := 0; l < maxLines; l++ {
-		line := &log.lines[i%maxLines]
+	for l := uint32(0); l < maxLines; l++ {
+		line := &log.lines[(i+l)%maxLines]
 		if line.timeNs == 0 {
-			i++
 			continue
 		}
 		index := bytes.IndexByte(line.line[:], 0)
 		if index < 1 {
-			i++
 			continue
 		}
 		var bytes int
@@ -161,7 +159,6 @@ func (rl *Ringlogger) WriteTo(out io.Writer) (n int64, err error) {
 			return
 		}
 		n += int64(bytes)
-		i++
 	}
 	return
 }
-- 
cgit v1.2.3-59-g8ed1b