diff options
author | Russ Cox <rsc@golang.org> | 2010-05-03 17:47:40 -0700 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2010-05-03 17:47:40 -0700 |
commit | 23705226c83793f8c0167ce8a4f9789f5bc4fcd7 (patch) | |
tree | 7443eed383e1279dcd0fb5f0a01377daba5efbd6 | |
parent | 08ae038c0f27ff602fb0bf4ddc8a5cfbcd7af410 (diff) | |
download | go-23705226c83793f8c0167ce8a4f9789f5bc4fcd7.tar.gz |
runtime, strconv: tiny cleanups
R=r
CC=golang-dev
http://codereview.appspot.com/1081042
-rw-r--r-- | src/pkg/runtime/slice.c | 4 | ||||
-rw-r--r-- | src/pkg/strconv/decimal.go | 17 |
2 files changed, 6 insertions, 15 deletions
diff --git a/src/pkg/runtime/slice.c b/src/pkg/runtime/slice.c index d967b1669..4162b8daa 100644 --- a/src/pkg/runtime/slice.c +++ b/src/pkg/runtime/slice.c @@ -186,9 +186,7 @@ void void ·slicecopy(Slice to, Slice fm, uintptr width, int32 ret) { - if(fm.array == nil || fm.len == 0 || - to.array == nil || to.len == 0 || - width == 0) { + if(fm.len == 0 || to.len == 0 || width == 0) { ret = 0; goto out; } diff --git a/src/pkg/strconv/decimal.go b/src/pkg/strconv/decimal.go index 3a7ebf926..b3348512f 100644 --- a/src/pkg/strconv/decimal.go +++ b/src/pkg/strconv/decimal.go @@ -41,32 +41,25 @@ func (a *decimal) String() string { buf[w] = '.' w++ w += digitZero(buf[w : w+-a.dp]) - w += copy(buf[w:w+a.nd], a.d[0:a.nd]) + w += copy(buf[w:], a.d[0:a.nd]) case a.dp < a.nd: // decimal point in middle of digits - w += copy(buf[w:w+a.dp], a.d[0:a.dp]) + w += copy(buf[w:], a.d[0:a.dp]) buf[w] = '.' w++ - w += copy(buf[w:w+a.nd-a.dp], a.d[a.dp:a.nd]) + w += copy(buf[w:], a.d[a.dp:a.nd]) default: // zeros fill space between digits and decimal point - w += copy(buf[w:w+a.nd], a.d[0:a.nd]) + w += copy(buf[w:], a.d[0:a.nd]) w += digitZero(buf[w : w+a.dp-a.nd]) } return string(buf[0:w]) } -func copy(dst []byte, src []byte) int { - for i := 0; i < len(dst); i++ { - dst[i] = src[i] - } - return len(dst) -} - func digitZero(dst []byte) int { - for i := 0; i < len(dst); i++ { + for i := range dst { dst[i] = '0' } return len(dst) |