mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-04 12:37:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

all: use bytes.Cut, strings.Cut

Browse source 
Many uses of Index/IndexByte/IndexRune/Split/SplitN
can be written more clearly using the new Cut functions.
Do that. Also rewrite to other functions if that's clearer.

For #46336.

Change-Id: I68d024716ace41a57a8bf74455c62279bde0f448
Reviewed-on: https://go-review.googlesource.com/c/go/+/351711
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Russ Cox 2021-09-22 10:46:32 -04:00
parent 3ada52a07f
commit b5419a1985
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
handshake_client_test.go
View file

@ -97,18 +97,18 @@ func (o *opensslOutputSink) Write(data []byte) (n int, err error) {
o.all = append(o.all, data...) o.all = append(o.all, data...)
for { for {
i := bytes.IndexByte(o.line, '\n') line, next, ok := bytes.Cut(o.line, []byte("\n"))
if i < 0 { if !ok {
break break
} }
if bytes.Equal([]byte(opensslEndOfHandshake), o.line[:i]) { if bytes.Equal([]byte(opensslEndOfHandshake), line) {
o.handshakeComplete <- struct{}{} o.handshakeComplete <- struct{}{}
} }
if bytes.Equal([]byte(opensslReadKeyUpdate), o.line[:i]) { if bytes.Equal([]byte(opensslReadKeyUpdate), line) {
o.readKeyUpdate <- struct{}{} o.readKeyUpdate <- struct{}{}
} }
o.line = o.line[i+1:] o.line = next
} }
return len(data), nil return len(data), nil

13
handshake_test.go
View file

@ -191,18 +191,17 @@ func parseTestData(r io.Reader) (flows [][]byte, err error) {
// Otherwise the line is a line of hex dump that looks like: // Otherwise the line is a line of hex dump that looks like:
// 00000170 fc f5 06 bf (...) |.....X{&?......!| // 00000170 fc f5 06 bf (...) |.....X{&?......!|
// (Some bytes have been omitted from the middle section.) // (Some bytes have been omitted from the middle section.)
_, after, ok := strings.Cut(line, " ")
if i := strings.IndexByte(line, ' '); i >= 0 { if !ok {
line = line[i:]
} else {
return nil, errors.New("invalid test data") return nil, errors.New("invalid test data")
} }
line = after
if i := strings.IndexByte(line, '|'); i >= 0 { before, _, ok := strings.Cut(line, "|")
line = line[:i] if !ok {
} else {
return nil, errors.New("invalid test data") return nil, errors.New("invalid test data")
} }
line = before
hexBytes := strings.Fields(line) hexBytes := strings.Fields(line)
for _, hexByte := range hexBytes { for _, hexByte := range hexBytes {