diff options
| author | Russ Cox <rsc@golang.org> | 2010-04-09 15:30:40 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-04-09 15:30:40 -0700 |
| commit | 6363542695045d39715c3d00a0d4863e6f85ada2 (patch) | |
| tree | 0c038cd0f1668e510d51195b96ff37adbc4b5e73 /src/pkg/runtime/string.cgo | |
| parent | 08852ffe80b30f8c46c7a9b68c56b0dee42584c4 (diff) | |
| download | go-6363542695045d39715c3d00a0d4863e6f85ada2.tar.xz | |
runtime: delete malx, skip_depth argument to malloc
remove internal functions from traces in gopprof instead.
R=r
CC=golang-dev
https://golang.org/cl/855046
Diffstat (limited to 'src/pkg/runtime/string.cgo')
| -rw-r--r-- | src/pkg/runtime/string.cgo | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pkg/runtime/string.cgo b/src/pkg/runtime/string.cgo index 005b0ffc80..103ac329b4 100644 --- a/src/pkg/runtime/string.cgo +++ b/src/pkg/runtime/string.cgo @@ -41,7 +41,7 @@ gostringsize(int32 l) if(l == 0) return emptystring; - s.str = malx(l+1, 1); // leave room for NUL for C runtime (e.g., callers of getenv) + s.str = mal(l+1); // leave room for NUL for C runtime (e.g., callers of getenv) s.len = l; if(l > maxstring) maxstring = l; @@ -197,7 +197,7 @@ func slicebytetostring(b Slice) (s String) { } func stringtoslicebyte(s String) (b Slice) { - b.array = mallocgc(s.len, RefNoPointers, 1, 1, 1); + b.array = mallocgc(s.len, RefNoPointers, 1, 1); b.len = s.len; b.cap = s.len; mcpy(b.array, s.str, s.len); @@ -240,7 +240,7 @@ func stringtosliceint(s String) (b Slice) { n++; } - b.array = mallocgc(n*sizeof(r[0]), RefNoPointers, 1, 1, 1); + b.array = mallocgc(n*sizeof(r[0]), RefNoPointers, 1, 1); b.len = n; b.cap = n; p = s.str; |
