encoding/binary: replace constant literals with named constant (cleanup)

Follow-up on https://golang.org/cl/247120.

Brought to my attention by Luke McCoy.

Change-Id: I4530c96fb164d23b0ce5311f2cecb1964f2dea74
Reviewed-on: https://go-review.googlesource.com/c/go/+/249837
Reviewed-by: Katie Hockman <katie@golang.org>

diff --git a/src/encoding/binary/varint.go b/src/encoding/binary/varint.go
index 38af61075c860ef6b97b883bc6be2508a1c914f1..1fa325dec7fd944ad650788533dd3236047a05f2 100644 (file)
--- a/src/encoding/binary/varint.go
+++ b/src/encoding/binary/varint.go
@@ -62,7 +62,7 @@ func Uvarint(buf []byte) (uint64, int) {
        var s uint
        for i, b := range buf {
                if b < 0x80 {
-                       if i > 9 || i == 9 && b > 1 {
+                       if i >= MaxVarintLen64 || i == MaxVarintLen64-1 && b > 1 {
                                return 0, -(i + 1) // overflow
                        }
                        return x | uint64(b)<<s, i + 1
@@ -112,7 +112,7 @@ func ReadUvarint(r io.ByteReader) (uint64, error) {
                        return x, err
                }
                if b < 0x80 {
-                       if i == 9 && b > 1 {
+                       if i == MaxVarintLen64-1 && b > 1 {
                                return x, overflow
                        }
                        return x | uint64(b)<<s, nil