From 8f66dc007a12ebbdd31ecbdbf3f6f952c0c88586 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 25 Apr 2017 22:44:27 +0200 Subject: Switch to bufio.Reader --- zsig/zsig.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'zsig/zsig.go') diff --git a/zsig/zsig.go b/zsig/zsig.go index 2da9a1f..13b9731 100644 --- a/zsig/zsig.go +++ b/zsig/zsig.go @@ -41,7 +41,7 @@ type Header struct { type Reader struct { Header - r io.Reader + r *bufio.Reader digest uint32 // CRC32 IEEE } @@ -55,7 +55,7 @@ func noEOF(err error) error { var le = binary.LittleEndian func NewReader(r io.Reader) (*Reader, error) { - z := &Reader{r: r} + z := &Reader{r: bufio.NewReader(r)} hdr, err := z.readHeader() if err != nil { return nil, err @@ -117,15 +117,13 @@ func (z *Reader) readHeader() (hdr Header, err error) { } func (z *Reader) readString() (string, error) { - r := bufio.NewReader(z.r) - s, err := r.ReadString(0) + s, err := z.r.ReadString(0) if err != nil { return "", err } if l := len(s); l > 0 && s[l-1] == 0 { s = s[:l-1] // strip last zero } - z.r = r // replace orginal reader return s, nil } -- cgit v1.2.3