uint* to int* whereever appropriate; https://www.reddit.com/r/golang/comments/2q5vdu/int_vs_uint/

binary/byteslice.go

@@ -10,12 +10,12 @@ const (
 )
 
 func WriteByteSlice(bz []byte, w io.Writer, n *int64, err *error) {
-	WriteUvarint(uint(len(bz)), w, n, err)
+	WriteVarint(len(bz), w, n, err)
 	WriteTo(bz, w, n, err)
 }
 
 func ReadByteSlice(r io.Reader, n *int64, err *error) []byte {
-	length := int(ReadUvarint(r, n, err))
+	length := ReadVarint(r, n, err)
 	if *err != nil {
 		return nil
 	}
@@ -36,7 +36,7 @@ func ReadByteSlice(r io.Reader, n *int64, err *error) []byte {
 //-----------------------------------------------------------------------------
 
 func WriteByteSlices(bzz [][]byte, w io.Writer, n *int64, err *error) {
-	WriteUvarint(uint(len(bzz)), w, n, err)
+	WriteVarint(len(bzz), w, n, err)
 	for _, bz := range bzz {
 		WriteByteSlice(bz, w, n, err)
 		if *err != nil {
@@ -46,7 +46,7 @@ func WriteByteSlices(bzz [][]byte, w io.Writer, n *int64, err *error) {
 }
 
 func ReadByteSlices(r io.Reader, n *int64, err *error) [][]byte {
-	length := int(ReadUvarint(r, n, err))
+	length := ReadVarint(r, n, err)
 	if *err != nil {
 		return nil
 	}

binary/int.go

@@ -219,6 +219,9 @@ func ReadVarint(r io.Reader, n *int64, err *error) int {
 		return 0
 	}
 	if size == 0 {
+		if negate {
+			setFirstErr(err, errors.New("Varint does not allow negative zero"))
+		}
 		return 0
 	}
 	buf := make([]byte, 8)

binary/reflect.go

@@ -432,7 +432,7 @@ func writeReflectBinary(rv reflect.Value, rt reflect.Type, opts Options, w io.Wr
 		} else {
 			// Write length
 			length := rv.Len()
-			WriteUvarint(uint(length), w, n, err)
+			WriteVarint(length, w, n, err)
 			// Write elems
 			for i := 0; i < length; i++ {
 				elemRv := rv.Index(i)