summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2008-11-19 10:20:52 -0800
committerRobert Griesemer <gri@golang.org>2008-11-19 10:20:52 -0800
commit55b4b4555ab75ad85e145be5fc3780762a26c532 (patch)
tree12139bc287dfc49d9d421076725e4761094f307b /src
parentbdfc0734d31374abb58e39c635448287f302857e (diff)
downloadgolang-55b4b4555ab75ad85e145be5fc3780762a26c532.tar.gz
saving 2 lines :-)
R=rsc DELTA=5 (0 added, 2 deleted, 3 changed) OCL=19562 CL=19585
Diffstat (limited to 'src')
-rw-r--r--src/lib/io.go8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/io.go b/src/lib/io.go
index b74911d4d..9ae926441 100644
--- a/src/lib/io.go
+++ b/src/lib/io.go
@@ -82,11 +82,9 @@ export func MakeFullReader(fd Read) Read {
export func Copyn(src Read, dst Write, n int64) (written int64, err *os.Error) {
buf := new([]byte, 32*1024);
for written < n {
- var l int;
- if n - written > int64(len(buf)) {
- l = len(buf);
- } else {
- l = int(n - written);
+ l := len(buf);
+ if d := n - written; d < int64(l) {
+ l = int(d);
}
nr, er := src.Read(buf[0 : l]);
if nr > 0 {