Use bytealg.IndexByteString in UTF16FromString instead of an open-coded
loop.
Change-Id: I366448382f2d0adeca6b254131e0087a1f489258
Reviewed-on: https://go-review.googlesource.com/c/go/+/393614
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
import (
errorspkg "errors"
+ "internal/bytealg"
"internal/itoa"
"internal/oserror"
"internal/race"
// s, with a terminating NUL added. If s contains a NUL byte at any
// location, it returns (nil, EINVAL).
func UTF16FromString(s string) ([]uint16, error) {
- for i := 0; i < len(s); i++ {
- if s[i] == 0 {
- return nil, EINVAL
- }
+ if bytealg.IndexByteString(s, 0) != -1 {
+ return nil, EINVAL
}
return utf16.Encode([]rune(s + "\x00")), nil
}