all: remove redundant err declarations (#3855)
This commit is contained in:
parent
b4cfc8f6c7
commit
091e5535ab
@ -1414,8 +1414,6 @@ func TestUnixDomainSocket(t *testing.T) {
|
|||||||
|
|
||||||
listenPath := filepath.Join(tmpdir, "delve_test")
|
listenPath := filepath.Join(tmpdir, "delve_test")
|
||||||
|
|
||||||
var err error
|
|
||||||
|
|
||||||
dlvbin := protest.GetDlvBinary(t)
|
dlvbin := protest.GetDlvBinary(t)
|
||||||
defer os.Remove(dlvbin)
|
defer os.Remove(dlvbin)
|
||||||
|
|
||||||
|
@ -304,7 +304,6 @@ func (bpstate *BreakpointState) checkCond(tgt *Target, breaklet *Breaklet, threa
|
|||||||
case StepBreakpoint, NextBreakpoint, NextDeferBreakpoint:
|
case StepBreakpoint, NextBreakpoint, NextDeferBreakpoint:
|
||||||
nextDeferOk := true
|
nextDeferOk := true
|
||||||
if breaklet.Kind&NextDeferBreakpoint != 0 {
|
if breaklet.Kind&NextDeferBreakpoint != 0 {
|
||||||
var err error
|
|
||||||
frames, err := ThreadStacktrace(tgt, thread, 2)
|
frames, err := ThreadStacktrace(tgt, thread, 2)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
nextDeferOk, _ = isPanicCall(frames)
|
nextDeferOk, _ = isPanicCall(frames)
|
||||||
|
@ -1316,7 +1316,6 @@ func (s *Session) stopDebugSession(killProcess bool) error {
|
|||||||
if s.debugger == nil {
|
if s.debugger == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
var err error
|
|
||||||
var exited error
|
var exited error
|
||||||
// Halting will stop any debugger command that's pending on another
|
// Halting will stop any debugger command that's pending on another
|
||||||
// per-request goroutine. Tell auto-resumer not to resume, so the
|
// per-request goroutine. Tell auto-resumer not to resume, so the
|
||||||
|
@ -1937,7 +1937,6 @@ func (d *Debugger) convertStacktrace(rawlocs []proc.Stackframe, cfg *proc.LoadCo
|
|||||||
frame.Err = rawlocs[i].Err.Error()
|
frame.Err = rawlocs[i].Err.Error()
|
||||||
}
|
}
|
||||||
if cfg != nil && rawlocs[i].Current.Fn != nil {
|
if cfg != nil && rawlocs[i].Current.Fn != nil {
|
||||||
var err error
|
|
||||||
scope := proc.FrameToScope(d.target.Selected, d.target.Selected.Memory(), nil, 0, rawlocs[i:]...)
|
scope := proc.FrameToScope(d.target.Selected, d.target.Selected.Memory(), nil, 0, rawlocs[i:]...)
|
||||||
locals, err := scope.LocalVariables(*cfg)
|
locals, err := scope.LocalVariables(*cfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -317,7 +317,6 @@ type DisassembleRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *RPCServer) Disassemble(args DisassembleRequest, answer *api.AsmInstructions) error {
|
func (s *RPCServer) Disassemble(args DisassembleRequest, answer *api.AsmInstructions) error {
|
||||||
var err error
|
|
||||||
insts, err := s.debugger.Disassemble(args.Scope.GoroutineID, args.StartPC, args.EndPC)
|
insts, err := s.debugger.Disassemble(args.Scope.GoroutineID, args.StartPC, args.EndPC)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -201,7 +201,6 @@ func (s *RPCServer) Stacktrace(arg StacktraceIn, out *StacktraceOut) error {
|
|||||||
if arg.Defers {
|
if arg.Defers {
|
||||||
arg.Opts |= api.StacktraceReadDefers
|
arg.Opts |= api.StacktraceReadDefers
|
||||||
}
|
}
|
||||||
var err error
|
|
||||||
rawlocs, err := s.debugger.Stacktrace(arg.Id, arg.Depth, arg.Opts)
|
rawlocs, err := s.debugger.Stacktrace(arg.Id, arg.Depth, arg.Opts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -781,7 +780,6 @@ type DisassembleOut struct {
|
|||||||
//
|
//
|
||||||
// Disassemble will also try to calculate the destination address of an absolute indirect CALL if it happens to be the instruction the selected goroutine is stopped at.
|
// Disassemble will also try to calculate the destination address of an absolute indirect CALL if it happens to be the instruction the selected goroutine is stopped at.
|
||||||
func (s *RPCServer) Disassemble(arg DisassembleIn, out *DisassembleOut) error {
|
func (s *RPCServer) Disassemble(arg DisassembleIn, out *DisassembleOut) error {
|
||||||
var err error
|
|
||||||
insts, err := s.debugger.Disassemble(arg.Scope.GoroutineID, arg.StartPC, arg.EndPC)
|
insts, err := s.debugger.Disassemble(arg.Scope.GoroutineID, arg.StartPC, arg.EndPC)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -828,7 +826,6 @@ type ListCheckpointsOut struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *RPCServer) ListCheckpoints(arg ListCheckpointsIn, out *ListCheckpointsOut) error {
|
func (s *RPCServer) ListCheckpoints(arg ListCheckpointsIn, out *ListCheckpointsOut) error {
|
||||||
var err error
|
|
||||||
cps, err := s.debugger.Checkpoints()
|
cps, err := s.debugger.Checkpoints()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
Loading…
Reference in New Issue
Block a user