diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-03-30 15:33:16 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-03-30 15:33:16 +0000 |
| commit | f72f4169133572cf62f1e872c5657cdbc4d5de2c (patch) | |
| tree | 9382d76e5dc68294cdf3c4f2c03a9f61b44fb014 /libgo/go/bytes/bytes.go | |
| parent | f2034d064c29d9620c5562b2b5b517bdc6c7a672 (diff) | |
| download | gcc-f72f4169133572cf62f1e872c5657cdbc4d5de2c.zip gcc-f72f4169133572cf62f1e872c5657cdbc4d5de2c.tar.gz gcc-f72f4169133572cf62f1e872c5657cdbc4d5de2c.tar.bz2 | |
Update to current Go library.
From-SVN: r171732
Diffstat (limited to 'libgo/go/bytes/bytes.go')
| -rw-r--r-- | libgo/go/bytes/bytes.go | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/libgo/go/bytes/bytes.go b/libgo/go/bytes/bytes.go index bfe2ef3..c12a135 100644 --- a/libgo/go/bytes/bytes.go +++ b/libgo/go/bytes/bytes.go @@ -293,20 +293,10 @@ func Join(a [][]byte, sep []byte) []byte { } b := make([]byte, n) - bp := 0 - for i := 0; i < len(a); i++ { - s := a[i] - for j := 0; j < len(s); j++ { - b[bp] = s[j] - bp++ - } - if i+1 < len(a) { - s = sep - for j := 0; j < len(s); j++ { - b[bp] = s[j] - bp++ - } - } + bp := copy(b, a[0]) + for _, s := range a[1:] { + bp += copy(b[bp:], sep) + bp += copy(b[bp:], s) } return b } |