]> Cypherpunks repositories - gostls13.git/commitdiff
saving 2 lines :-)
authorRobert Griesemer <gri@golang.org>
Wed, 19 Nov 2008 18:20:52 +0000 (10:20 -0800)
committerRobert Griesemer <gri@golang.org>
Wed, 19 Nov 2008 18:20:52 +0000 (10:20 -0800)
R=rsc
DELTA=5  (0 added, 2 deleted, 3 changed)
OCL=19562
CL=19585

src/lib/io.go

index b74911d4def174024175351d27233315ff34cd58..9ae9264416100ed5d811213903be7434f2829795 100644 (file)
@@ -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 {