tidy up readLine

2680dba0 · Kamil Kisiel · 1af399ba · 2680dba0 · 2680dba0
Commit 2680dba0 authored Jun 23, 2015 by Kamil Kisiel
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 12 deletions

ogórek.go ogórek.go +9 -6

ogórek.go ogórek.go +9 -6

No files found.
--- a/ogórek.go
+++ b/ogórek.go
@@ -239,15 +239,18 @@ func (d Decoder) Decode() (interface{}, error) {
 }
 func (d *Decoder) readLine() ([]byte, error) {
-	var has_more bool = true
+	var (
-	var line []byte = []byte{}
+		line     []byte
-	for has_more {
+		data     []byte
-		read_data, is_prefix, err := d.r.ReadLine()
+		isPrefix = true
+		err      error
+	)
+	for isPrefix {
+		data, isPrefix, err = d.r.ReadLine()
 		if err != nil {
 			return line, err
 		}
-		has_more = is_prefix
+		line = append(line, data...)
-		line = append(line, read_data...)
 	}
 	return line, nil
 }

--- a/ogórek.go
+++ b/ogórek.go
@@ -239,15 +239,18 @@ func (d Decoder) Decode() (interface{}, error) {
 }
 func (d *Decoder) readLine() ([]byte, error) {
-	var has_more bool = true
+	var (
-	var line []byte = []byte{}
+		line     []byte
-	for has_more {
+		data     []byte
-		read_data, is_prefix, err := d.r.ReadLine()
+		isPrefix = true
+		err      error
+	)
+	for isPrefix {
+		data, isPrefix, err = d.r.ReadLine()
 		if err != nil {
 			return line, err
 		}
-		has_more = is_prefix
+		line = append(line, data...)
-		line = append(line, read_data...)
 	}
 	return line, nil
 }