Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

bytes: make Join return a new buffer on len(a) == 1

Browse source 
Fixes #3844.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/6432054
This commit is contained in:
Gustavo Niemeyer 2012-07-20 16:04:22 -03:00
parent 7bf8355dc7
commit c0efcac6a9
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pkg/bytes/bytes.go
View file

@ -333,14 +333,15 @@ func FieldsFunc(s []byte, f func(rune) bool) [][]byte {
return a[0:na]
}
// Join concatenates the elements of a to create a single byte array. The separator
// Join concatenates the elements of a to create a new byte array. The separator
// sep is placed between elements in the resulting array.
func Join(a [][]byte, sep []byte) []byte {
if len(a) == 0 {
return []byte{}
}
if len(a) == 1 {
return a[0]
// Just return a copy.
return append([]byte(nil), a[0]...)
}
n := len(sep) * (len(a) - 1)
for i := 0; i < len(a); i++ {
@ -619,10 +620,8 @@ func Replace(s, old, new []byte, n int) []byte {
m = Count(s, old)
}
if m == 0 {
// Nothing to do. Just copy.
t := make([]byte, len(s))
copy(t, s)
return t
// Just return a copy.
return append([]byte(nil), s...)
}
if n < 0 || m < n {
n = m