From 9dfdea45c174cc8bb95af39636db22f9e211f7ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serhat=20=C5=9Eevki=20Din=C3=A7er?= Date: Sun, 1 Jan 2023 23:16:38 +1100 Subject: [PATCH] :broom: :bug: fix some warnings, go-ole on mac os (#2280) * :broom: fix some warnings * :bug: fix go-ole on mac os --- .../go-ole/{variant_386.go => variant32.go} | 4 +- .../go-ole/{variant_amd64.go => variant64.go} | 4 +- internal/go-ole/variant_ppc64le.go | 13 ------- internal/go-ole/variant_s390x.go | 13 ------- internal/gopsutil/common/common_unix.go | 3 +- internal/gopsutil/mem/mem.go | 2 +- internal/gopsutil/net/net.go | 2 +- internal/gopsutil/net/net_darwin.go | 2 +- internal/gopsutil/process/process.go | 4 +- internal/gopsutil/process/process_darwin.go | 7 ++-- internal/memory/memory.go | 37 +++++++++---------- internal/msgp/elsize.go | 16 ++++---- internal/msgp/write.go | 4 +- internal/schema/encoder.go | 4 +- 14 files changed, 43 insertions(+), 72 deletions(-) rename internal/go-ole/{variant_386.go => variant32.go} (80%) rename internal/go-ole/{variant_amd64.go => variant64.go} (70%) delete mode 100644 internal/go-ole/variant_ppc64le.go delete mode 100644 internal/go-ole/variant_s390x.go diff --git a/internal/go-ole/variant_386.go b/internal/go-ole/variant32.go similarity index 80% rename from internal/go-ole/variant_386.go rename to internal/go-ole/variant32.go index 2e3d3aa4aa..9d17d1f09e 100644 --- a/internal/go-ole/variant_386.go +++ b/internal/go-ole/variant32.go @@ -1,5 +1,5 @@ -//go:build 386 -// +build 386 +//go:build 386 || arm +// +build 386 arm package ole diff --git a/internal/go-ole/variant_amd64.go b/internal/go-ole/variant64.go similarity index 70% rename from internal/go-ole/variant_amd64.go rename to internal/go-ole/variant64.go index b48c3ce6fc..474adaad8e 100644 --- a/internal/go-ole/variant_amd64.go +++ b/internal/go-ole/variant64.go @@ -1,5 +1,5 @@ -//go:build amd64 -// +build amd64 +//go:build amd64 || arm64 || ppc64le || s390x +// +build amd64 arm64 ppc64le s390x package ole diff --git a/internal/go-ole/variant_ppc64le.go b/internal/go-ole/variant_ppc64le.go deleted file mode 100644 index 4ce060d8fc..0000000000 --- a/internal/go-ole/variant_ppc64le.go +++ /dev/null @@ -1,13 +0,0 @@ -//go:build ppc64le -// +build ppc64le - -package ole - -type VARIANT struct { - VT VT // 2 - wReserved1 uint16 // 4 - wReserved2 uint16 // 6 - wReserved3 uint16 // 8 - Val int64 // 16 - _ [8]byte // 24 -} diff --git a/internal/go-ole/variant_s390x.go b/internal/go-ole/variant_s390x.go deleted file mode 100644 index f83731098a..0000000000 --- a/internal/go-ole/variant_s390x.go +++ /dev/null @@ -1,13 +0,0 @@ -//go:build s390x -// +build s390x - -package ole - -type VARIANT struct { - VT VT // 2 - wReserved1 uint16 // 4 - wReserved2 uint16 // 6 - wReserved3 uint16 // 8 - Val int64 // 16 - _ [8]byte // 24 -} diff --git a/internal/gopsutil/common/common_unix.go b/internal/gopsutil/common/common_unix.go index a02f053e17..a4a953a2f5 100644 --- a/internal/gopsutil/common/common_unix.go +++ b/internal/gopsutil/common/common_unix.go @@ -42,8 +42,7 @@ func CallLsofWithContext(ctx context.Context, invoke Invoker, pid int32, args .. } func CallPgrepWithContext(ctx context.Context, invoke Invoker, pid int32) ([]int32, error) { - var cmd []string - cmd = []string{"-P", strconv.Itoa(int(pid))} + cmd := []string{"-P", strconv.Itoa(int(pid))} pgrep, err := exec.LookPath("pgrep") if err != nil { return []int32{}, err diff --git a/internal/gopsutil/mem/mem.go b/internal/gopsutil/mem/mem.go index f3aea58519..69cb881010 100644 --- a/internal/gopsutil/mem/mem.go +++ b/internal/gopsutil/mem/mem.go @@ -6,7 +6,7 @@ import ( "github.com/gofiber/fiber/v2/internal/gopsutil/common" ) -var invoke common.Invoker = common.Invoke{} +var _ common.Invoke // Memory usage statistics. Total, Available and Used contain numbers of bytes // for human consumption. diff --git a/internal/gopsutil/net/net.go b/internal/gopsutil/net/net.go index 0fccecd3e7..53f2f7dd63 100644 --- a/internal/gopsutil/net/net.go +++ b/internal/gopsutil/net/net.go @@ -125,7 +125,7 @@ func (l *ConntrackStatList) Append(c *ConntrackStat) { } func (l *ConntrackStatList) Items() []ConntrackStat { - items := make([]ConntrackStat, len(l.items), len(l.items)) + items := make([]ConntrackStat, len(l.items)) for i, el := range l.items { items[i] = *el } diff --git a/internal/gopsutil/net/net_darwin.go b/internal/gopsutil/net/net_darwin.go index 32d67c0d51..a7e382dcbb 100644 --- a/internal/gopsutil/net/net_darwin.go +++ b/internal/gopsutil/net/net_darwin.go @@ -251,7 +251,7 @@ func IOCountersWithContext(ctx context.Context, pernic bool) ([]IOCountersStat, } } - if pernic == false { + if !pernic { return getIOCountersAll(ret) } return ret, nil diff --git a/internal/gopsutil/process/process.go b/internal/gopsutil/process/process.go index 1710446304..bbf0fdf148 100644 --- a/internal/gopsutil/process/process.go +++ b/internal/gopsutil/process/process.go @@ -164,8 +164,8 @@ func NewProcess(pid int32) (*Process, error) { if !exists { return p, ErrorProcessNotRunning } - p.CreateTime() - return p, nil + _, err = p.CreateTime() + return p, err } func PidExists(pid int32) (bool, error) { diff --git a/internal/gopsutil/process/process_darwin.go b/internal/gopsutil/process/process_darwin.go index fb42b23c32..432b5175d9 100644 --- a/internal/gopsutil/process/process_darwin.go +++ b/internal/gopsutil/process/process_darwin.go @@ -417,9 +417,9 @@ func convertCPUTimes(s string) (ret float64, err error) { if err != nil { return ret, err } - h, err := strconv.Atoi(_t[0]) + h, _ := strconv.Atoi(_t[0]) t += h * ClockTicks - h, err = strconv.Atoi(_t[1]) + h, _ = strconv.Atoi(_t[1]) t += h return float64(t) / ClockTicks, nil } @@ -608,8 +608,7 @@ func (p *Process) getKProc() (*KinfoProc, error) { func (p *Process) getKProcWithContext(ctx context.Context) (*KinfoProc, error) { mib := []int32{CTLKern, KernProc, KernProcPID, p.Pid} - procK := KinfoProc{} - length := uint64(unsafe.Sizeof(procK)) + length := uint64(unsafe.Sizeof(KinfoProc{})) buf := make([]byte, length) _, _, syserr := unix.Syscall6( 202, // unix.SYS___SYSCTL https://github.com/golang/sys/blob/76b94024e4b621e672466e8db3d7f084e7ddcad2/unix/zsysnum_darwin_amd64.go#L146 diff --git a/internal/memory/memory.go b/internal/memory/memory.go index ff2202847b..d7b053de46 100644 --- a/internal/memory/memory.go +++ b/internal/memory/memory.go @@ -73,28 +73,25 @@ func (s *Storage) gc(sleep time.Duration) { defer ticker.Stop() var expired []string - for { - select { - case <-ticker.C: - ts := atomic.LoadUint32(&utils.Timestamp) - expired = expired[:0] - s.RLock() - for key, v := range s.data { - if v.e != 0 && v.e <= ts { - expired = append(expired, key) - } + for range ticker.C { + ts := atomic.LoadUint32(&utils.Timestamp) + expired = expired[:0] + s.RLock() + for key, v := range s.data { + if v.e != 0 && v.e <= ts { + expired = append(expired, key) } - s.RUnlock() - s.Lock() - // Double-checked locking. - // We might have replaced the item in the meantime. - for i := range expired { - v := s.data[expired[i]] - if v.e != 0 && v.e <= ts { - delete(s.data, expired[i]) - } + } + s.RUnlock() + s.Lock() + // Double-checked locking. + // We might have replaced the item in the meantime. + for i := range expired { + v := s.data[expired[i]] + if v.e != 0 && v.e <= ts { + delete(s.data, expired[i]) } - s.Unlock() } + s.Unlock() } } diff --git a/internal/msgp/elsize.go b/internal/msgp/elsize.go index 0bf2b9fb05..601d388636 100644 --- a/internal/msgp/elsize.go +++ b/internal/msgp/elsize.go @@ -83,14 +83,14 @@ type bytespec struct { type varmode int8 const ( - constsize varmode = 0 // constant size (size bytes + uint8(varmode) objects) - extra8 = -1 // has uint8(p[1]) extra bytes - extra16 = -2 // has be16(p[1:]) extra bytes - extra32 = -3 // has be32(p[1:]) extra bytes - map16v = -4 // use map16 - map32v = -5 // use map32 - array16v = -6 // use array16 - array32v = -7 // use array32 + constsize varmode = -iota // constant size (size bytes + uint8(varmode) objects) + extra8 // has uint8(p[1]) extra bytes + extra16 // has be16(p[1:]) extra bytes + extra32 // has be32(p[1:]) extra bytes + map16v // use map16 + map32v // use map32 + array16v // use array16 + array32v // use array32 ) func getType(v byte) Type { diff --git a/internal/msgp/write.go b/internal/msgp/write.go index 8b3e6cb2d0..24fee4ba15 100644 --- a/internal/msgp/write.go +++ b/internal/msgp/write.go @@ -778,7 +778,9 @@ func (mw *Writer) writeVal(v reflect.Value) error { case reflect.Interface, reflect.Ptr: if v.IsNil() { - mw.WriteNil() + if err := mw.WriteNil(); err != nil { + return err + } } return mw.writeVal(v.Elem()) diff --git a/internal/schema/encoder.go b/internal/schema/encoder.go index f0ed631210..c01de00dd7 100644 --- a/internal/schema/encoder.go +++ b/internal/schema/encoder.go @@ -94,7 +94,7 @@ func (e *Encoder) encode(v reflect.Value, dst map[string][]string) error { // Encode struct pointer types if the field is a valid pointer and a struct. if isValidStructPointer(v.Field(i)) { - e.encode(v.Field(i).Elem(), dst) + _ = e.encode(v.Field(i).Elem(), dst) continue } @@ -112,7 +112,7 @@ func (e *Encoder) encode(v reflect.Value, dst map[string][]string) error { } if v.Field(i).Type().Kind() == reflect.Struct { - e.encode(v.Field(i), dst) + _ = e.encode(v.Field(i), dst) continue }