From cbc45e1670dee79c25390c38e01e85ba0f049bed Mon Sep 17 00:00:00 2001 From: gocurr Date: Sun, 9 Jul 2023 14:27:05 +0800 Subject: [PATCH] pkg/proc: simplify code with trivial changes (#3436) --- pkg/proc/core/delve_core.go | 2 +- pkg/proc/gdbserial/gdbserver_conn.go | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/proc/core/delve_core.go b/pkg/proc/core/delve_core.go index 9a8d146c..0e5442b2 100644 --- a/pkg/proc/core/delve_core.go +++ b/pkg/proc/core/delve_core.go @@ -100,10 +100,10 @@ func threadsFromDelveNotes(p *process, notes []*note) (proc.Thread, error) { readerr = fmt.Errorf("maximum len exceeded (%d) reading %s", len, kind) return nil } - buf := make([]byte, len) if readerr != nil { return nil } + buf := make([]byte, len) _, readerr = body.Read(buf) return buf } diff --git a/pkg/proc/gdbserial/gdbserver_conn.go b/pkg/proc/gdbserial/gdbserver_conn.go index f6bde758..dc395635 100644 --- a/pkg/proc/gdbserial/gdbserver_conn.go +++ b/pkg/proc/gdbserial/gdbserver_conn.go @@ -1286,7 +1286,7 @@ func (conn *gdbConn) exec(cmd []byte, context string) ([]byte, error) { return conn.recv(cmd, context, false) } -var hexdigit = []byte{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'} +const hexdigit = "0123456789abcdef" func (conn *gdbConn) send(cmd []byte) error { if len(cmd) == 0 || cmd[0] != '$' { @@ -1344,9 +1344,11 @@ func (conn *gdbConn) recv(cmd []byte, context string, binary bool) (resp []byte, if logflags.GdbWire() { out := resp partial := false - if idx := bytes.Index(out, []byte{'\n'}); idx >= 0 && !binary { - out = resp[:idx] - partial = true + if !binary { + if idx := bytes.Index(out, []byte{'\n'}); idx >= 0 { + out = resp[:idx] + partial = true + } } if len(out) > gdbWireMaxLen { out = out[:gdbWireMaxLen]