Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

gob: better debugging, commentary

Browse source 
Re-implement the debugging helper to be independent of the existing
implementation.  This is preparatory to a rewrite to clean up issue 1416.
Include a definition of the grammar of the data stream.

R=rsc
CC=golang-dev
https://golang.org/cl/3970045
This commit is contained in:
Rob Pike 2011-01-21 11:28:53 -08:00
parent 5cf120827c
commit 5b5a674b46
5 changed files with 680 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pkg/gob/decode.go
View file

@ -49,14 +49,15 @@ func overflow(name string) os.ErrorString {
// decodeUintReader reads an encoded unsigned integer from an io.Reader.
// Used only by the Decoder to read the message length.
func decodeUintReader(r io.Reader, buf []byte) (x uint64, err os.Error) {
_, err = r.Read(buf[0:1])
func decodeUintReader(r io.Reader, buf []byte) (x uint64, width int, err os.Error) {
width = 1
_, err = r.Read(buf[0:width])
if err != nil {
return
}
b := buf[0]
if b <= 0x7f {
return uint64(b), nil
return uint64(b), width, nil
}
nb := -int(int8(b))
if nb > uint64Size {
@ -75,6 +76,7 @@ func decodeUintReader(r io.Reader, buf []byte) (x uint64, err os.Error) {
for i := 0; i < n; i++ {
x <<= 8
x |= uint64(buf[i])
width++
}
return
}