]> Cypherpunks.ru repositories - gostls13.git/commitdiff
bufio: Use maxConsecutiveEmptyReads instead of 100
authorRyoichi KATO <ryo1kato@gmail.com>
Sun, 25 Jun 2017 06:39:29 +0000 (23:39 -0700)
committerBrad Fitzpatrick <bradfitz@golang.org>
Tue, 14 Nov 2017 05:21:00 +0000 (05:21 +0000)
Use maxConsecutiveEmptyReads const instead of hardcoded
100 in scan.go too.

Change-Id: I993f353a3748f0d6bdefab38bf5cb224eea8a969
Reviewed-on: https://go-review.googlesource.com/46915
Reviewed-by: Rob Pike <r@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
src/bufio/scan.go

index 9f741c983070159906ed59c24a84cd58fbc5ec95..40aaa4ab817b81c10dbdff502be0f8b164082f1b 100644 (file)
@@ -123,8 +123,9 @@ var ErrFinalToken = errors.New("final token")
 // After Scan returns false, the Err method will return any error that
 // occurred during scanning, except that if it was io.EOF, Err
 // will return nil.
-// Scan panics if the split function returns 100 empty tokens without
-// advancing the input. This is a common error mode for scanners.
+// Scan panics if the split function returns too many empty
+// tokens without advancing the input. This is a common error mode for
+// scanners.
 func (s *Scanner) Scan() bool {
        if s.done {
                return false
@@ -156,8 +157,8 @@ func (s *Scanner) Scan() bool {
                                } else {
                                        // Returning tokens not advancing input at EOF.
                                        s.empties++
-                                       if s.empties > 100 {
-                                               panic("bufio.Scan: 100 empty tokens without progressing")
+                                       if s.empties > maxConsecutiveEmptyReads {
+                                               panic("bufio.Scan: too many empty tokens without progressing")
                                        }
                                }
                                return true