From cf0e2243805468cb9d9866988e31cd590db82b7b Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Sat, 1 May 2010 13:00:01 -0700 Subject: vector: use correct capacity in call to make R=gri, r, bflm CC=golang-dev https://golang.org/cl/1032043 --- src/pkg/container/vector/stringvector.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/pkg/container/vector/stringvector.go') diff --git a/src/pkg/container/vector/stringvector.go b/src/pkg/container/vector/stringvector.go index fad20f58a5..86563ca203 100644 --- a/src/pkg/container/vector/stringvector.go +++ b/src/pkg/container/vector/stringvector.go @@ -12,6 +12,9 @@ func (p *StringVector) realloc(length, capacity int) (b []string) { if capacity < initialSize { capacity = initialSize } + if capacity < length { + capacity = length + } b = make(StringVector, length, capacity) copy(b, *p) *p = b @@ -186,9 +189,7 @@ func (p *StringVector) Pop() string { // AppendVector appends the entire vector x to the end of this vector. -func (p *StringVector) AppendVector(x *StringVector) { - p.InsertVector(len(*p), x) -} +func (p *StringVector) AppendVector(x *StringVector) { p.InsertVector(len(*p), x) } // Swap exchanges the elements at indexes i and j. -- cgit v1.3