From b2e840379d354a78cf2657de2f4961717b65a5da Mon Sep 17 00:00:00 2001 From: cui fliter Date: Wed, 7 Sep 2022 20:33:25 +0800 Subject: [PATCH] all: remove redundant type conversion Signed-off-by: cui fliter --- bpf/vm_instructions.go | 4 ++-- context/go17.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bpf/vm_instructions.go b/bpf/vm_instructions.go index cf8947c3..0aa307c0 100644 --- a/bpf/vm_instructions.go +++ b/bpf/vm_instructions.go @@ -94,7 +94,7 @@ func jumpIfCommon(cond JumpTest, skipTrue, skipFalse uint8, regA uint32, value u func loadAbsolute(ins LoadAbsolute, in []byte) (uint32, bool) { offset := int(ins.Off) - size := int(ins.Size) + size := ins.Size return loadCommon(in, offset, size) } @@ -121,7 +121,7 @@ func loadExtension(ins LoadExtension, in []byte) uint32 { func loadIndirect(ins LoadIndirect, in []byte, regX uint32) (uint32, bool) { offset := int(ins.Off) + int(regX) - size := int(ins.Size) + size := ins.Size return loadCommon(in, offset, size) } diff --git a/context/go17.go b/context/go17.go index 0a54bdbc..2cb9c408 100644 --- a/context/go17.go +++ b/context/go17.go @@ -32,7 +32,7 @@ var DeadlineExceeded = context.DeadlineExceeded // call cancel as soon as the operations running in this Context complete. func WithCancel(parent Context) (ctx Context, cancel CancelFunc) { ctx, f := context.WithCancel(parent) - return ctx, CancelFunc(f) + return ctx, f } // WithDeadline returns a copy of the parent context with the deadline adjusted @@ -46,7 +46,7 @@ func WithCancel(parent Context) (ctx Context, cancel CancelFunc) { // call cancel as soon as the operations running in this Context complete. func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) { ctx, f := context.WithDeadline(parent, deadline) - return ctx, CancelFunc(f) + return ctx, f } // WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).