From 2a476cbb498febb2362c45b0fe7524b68c601173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Senart?= <tomas@soundcloud.com>
Date: Fri, 16 Aug 2013 19:46:40 +0200
Subject: [PATCH] Use bufio.Scanner

---
 targets.go | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/targets.go b/targets.go
index f97cec9..fd1b8ca 100644
--- a/targets.go
+++ b/targets.go
@@ -22,16 +22,11 @@ func NewTargetsFromFile(filename string) (Targets, error) {
 }
 
 func NewTargets(source io.Reader) (Targets, error) {
-	reader := bufio.NewReader(source)
 	targets := make([]*http.Request, 0)
+	scanner := bufio.NewScanner(source)
 
-	for {
-		line, err := reader.ReadString('\n')
-		if err != nil && err == io.EOF {
-			break
-		} else if err != nil {
-			return targets, err
-		}
+	for scanner.Scan() {
+		line := scanner.Text()
 		if line = strings.TrimSpace(line); line == "" { // Empty line
 			continue
 		}
@@ -46,6 +41,9 @@ func NewTargets(source io.Reader) (Targets, error) {
 		}
 		targets = append(targets, req)
 	}
+	if err := scanner.Err(); err != nil {
+		return targets, err
+	}
 	return targets, nil
 }