X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=r.go;fp=r.go;h=0c65fd41d01d5039c2b9a3e36bbf9cb6e6b3f892;hb=db1063cacc062476c517de92da16720aa574ed19;hp=68a93ca4985d19ad81966c4f9327f350d7c24452;hpb=1fab645daaae612e25cc2d4498424fe33342127c;p=netstring.git diff --git a/r.go b/r.go index 68a93ca..0c65fd4 100644 --- a/r.go +++ b/r.go @@ -20,6 +20,7 @@ package netstring import ( "bufio" "errors" + "fmt" "io" "strconv" ) @@ -45,11 +46,11 @@ func (r *Reader) Next() (uint64, error) { } lenRaw, err := r.r.ReadSlice(':') if err != nil { - return 0, err + return 0, fmt.Errorf("netstring header: %w", err) } size, err := strconv.ParseUint(string(lenRaw[:len(lenRaw)-1]), 10, 64) if err != nil { - return 0, err + return 0, fmt.Errorf("netstring header: %w", err) } r.left = size r.eof = false @@ -59,10 +60,10 @@ func (r *Reader) Next() (uint64, error) { func (r *Reader) checkTerminator() error { b, err := r.r.ReadByte() if err != nil { - return err + return fmt.Errorf("netstring terminator: %w", err) } if b != ',' { - return errors.New("no terminator found") + return errors.New("netstring terminator: not found") } return nil }