From 04425938df3790177e6b78b9803396cf928d5757 Mon Sep 17 00:00:00 2001 From: Silvan Jegen Date: Sun, 14 Jun 2015 17:41:45 +0200 Subject: Change copy() usage --- unxml.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/unxml.go b/unxml.go index f266b1f..a9f8941 100644 --- a/unxml.go +++ b/unxml.go @@ -204,14 +204,11 @@ func (r *ElementReader) Read(out []byte) (int, error) { r.tagsinstack[string(tn)]-- } raw := r.xr.tokenizer.Raw() - if len(raw) < lenout { - n := copy(out[r.xr.count:], raw) - r.xr.count += n - lenout -= n - } else { - n = copy(out[r.xr.count:], raw[:lenout]) - r.xr.count += n - r.xr.lastread = raw[lenout:] + n := copy(out[r.xr.count:], raw) + r.xr.count += n + lenout -= n + if n < len(raw) { + r.xr.lastread = raw[n:] return r.xr.count, err } } -- cgit v1.2.1-18-gbd029