From 18fef8cc50ed3bae4654b1574e546503b48c1119 Mon Sep 17 00:00:00 2001
From: Silvan Jegen <s.jegen@gmail.com>
Date: Sun, 14 Jun 2015 17:38:09 +0200
Subject: Change usage of copy()

---
 unxml.go | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/unxml.go b/unxml.go
index a312410..f266b1f 100644
--- a/unxml.go
+++ b/unxml.go
@@ -183,14 +183,11 @@ func (r *ElementReader) Read(out []byte) (int, error) {
 				r.intagtokeep = true
 				raw := r.xr.tokenizer.Raw()
 				//fmt.Printf("TokenRaw: %s\n", 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