From 852f4552175e84b27653d33a5b23e1b6c923330a Mon Sep 17 00:00:00 2001
From: shirou <shirou.faw@gmail.com>
Date: Sun, 12 Feb 2023 09:24:52 +0000
Subject: [PATCH] fix lint
---
cpu/cpu_aix_nocgo.go | 22 +++++++++++-----------
disk/disk_aix_nocgo.go | 14 +++++++-------
disk/disk_freebsd.go | 3 +--
internal/common/binary.go | 1 +
internal/common/common.go | 1 +
internal/common/common_windows.go | 7 +++++--
load/load_aix_nocgo.go | 14 +++++++-------
mem/mem_aix_nocgo.go | 2 +-
mem/mem_freebsd.go | 3 +--
mem/mem_openbsd.go | 1 +
net/net_aix_cgo.go | 12 ++++++------
net/net_windows.go | 3 ++-
process/process_windows_32bit.go | 3 +--
13 files changed, 45 insertions(+), 41 deletions(-)
diff --git a/cpu/cpu_aix_nocgo.go b/cpu/cpu_aix_nocgo.go
index d158000..1a29153 100644
--- a/cpu/cpu_aix_nocgo.go
+++ b/cpu/cpu_aix_nocgo.go
@@ -6,8 +6,8 @@ package cpu
import (
"context"
"regexp"
- "strings"
"strconv"
+ "strings"
"github.com/shirou/gopsutil/v3/internal/common"
)
@@ -28,19 +28,19 @@ func TimesWithContext(ctx context.Context, percpu bool) ([]TimesStat, error) {
}
ret := TimesStat{CPU: "cpu-total"}
- h := whiteSpaces.Split(lines[len(lines)-3], -1) // headers
- v := whiteSpaces.Split(lines[len(lines)-2], -1) // values
+ h := whiteSpaces.Split(lines[len(lines)-3], -1) // headers
+ v := whiteSpaces.Split(lines[len(lines)-2], -1) // values
for i, header := range h {
if t, err := strconv.ParseFloat(v[i], 64); err == nil {
switch header {
- case `%usr`:
- ret.User = t
- case `%sys`:
- ret.System = t
- case `%wio`:
- ret.Iowait = t
- case `%idle`:
- ret.Idle = t
+ case `%usr`:
+ ret.User = t
+ case `%sys`:
+ ret.System = t
+ case `%wio`:
+ ret.Iowait = t
+ case `%idle`:
+ ret.Idle = t
}
}
}
diff --git a/disk/disk_aix_nocgo.go b/disk/disk_aix_nocgo.go
index 190a2d9..4f93c75 100644
--- a/disk/disk_aix_nocgo.go
+++ b/disk/disk_aix_nocgo.go
@@ -8,8 +8,8 @@ import (
"regexp"
"strings"
- "golang.org/x/sys/unix"
"github.com/shirou/gopsutil/v3/internal/common"
+ "golang.org/x/sys/unix"
)
var whiteSpaces = regexp.MustCompile(`\s+`)
@@ -17,11 +17,11 @@ var startBlank = regexp.MustCompile(`^\s+`)
var ignoreFSType = map[string]bool{"procfs": true}
var FSType = map[int]string{
- 0: "jfs2", 1: "namefs", 2: "nfs", 3: "jfs", 5: "cdrom", 6: "proc",
- 16: "special-fs", 17: "cache-fs", 18: "nfs3", 19: "automount-fs", 20: "pool-fs", 32: "vxfs",
- 33: "veritas-fs", 34: "udfs", 35: "nfs4", 36: "nfs4-pseudo", 37: "smbfs", 38: "mcr-pseudofs",
- 39: "ahafs", 40: "sterm-nfs", 41: "asmfs",
- }
+ 0: "jfs2", 1: "namefs", 2: "nfs", 3: "jfs", 5: "cdrom", 6: "proc",
+ 16: "special-fs", 17: "cache-fs", 18: "nfs3", 19: "automount-fs", 20: "pool-fs", 32: "vxfs",
+ 33: "veritas-fs", 34: "udfs", 35: "nfs4", 36: "nfs4-pseudo", 37: "smbfs", 38: "mcr-pseudofs",
+ 39: "ahafs", 40: "sterm-nfs", 41: "asmfs",
+}
func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, error) {
var ret []PartitionStat
@@ -42,7 +42,7 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
start := 0
finished := false
for pos, ch := range lines[1] {
- if ch == ' ' && ! finished {
+ if ch == ' ' && !finished {
name := strings.TrimSpace(lines[0][start:pos])
colidx[name] = idx
finished = true
diff --git a/disk/disk_freebsd.go b/disk/disk_freebsd.go
index 753ce9a..9b53106 100644
--- a/disk/disk_freebsd.go
+++ b/disk/disk_freebsd.go
@@ -12,9 +12,8 @@ import (
"strconv"
"strings"
- "golang.org/x/sys/unix"
-
"github.com/shirou/gopsutil/v3/internal/common"
+ "golang.org/x/sys/unix"
)
// PartitionsWithContext returns disk partition.
diff --git a/internal/common/binary.go b/internal/common/binary.go
index 446c359..5e8d43d 100644
--- a/internal/common/binary.go
+++ b/internal/common/binary.go
@@ -21,6 +21,7 @@ package common
// high-performance serialization, especially for large data structures,
// should look at more advanced solutions such as the encoding/gob
// package or protocol buffers.
+
import (
"errors"
"io"
diff --git a/internal/common/common.go b/internal/common/common.go
index 323402d..c1e96ca 100644
--- a/internal/common/common.go
+++ b/internal/common/common.go
@@ -6,6 +6,7 @@ package common
// - linux (amd64, arm)
// - freebsd (amd64)
// - windows (amd64)
+
import (
"bufio"
"bytes"
diff --git a/internal/common/common_windows.go b/internal/common/common_windows.go
index 295b70b..301b231 100644
--- a/internal/common/common_windows.go
+++ b/internal/common/common_windows.go
@@ -218,9 +218,12 @@ func WMIQueryWithContext(ctx context.Context, query string, dst interface{}, con
}
// Convert paths using native DOS format like:
-// "\Device\HarddiskVolume1\Windows\systemew\file.txt"
+//
+// "\Device\HarddiskVolume1\Windows\systemew\file.txt"
+//
// into:
-// "C:\Windows\systemew\file.txt"
+//
+// "C:\Windows\systemew\file.txt"
func ConvertDOSPath(p string) string {
rawDrive := strings.Join(strings.Split(p, `\`)[:3], `\`)
diff --git a/load/load_aix_nocgo.go b/load/load_aix_nocgo.go
index bfc4850..25d50ac 100644
--- a/load/load_aix_nocgo.go
+++ b/load/load_aix_nocgo.go
@@ -53,13 +53,13 @@ func MiscWithContext(ctx context.Context) (*MiscStat, error) {
for _, line := range strings.Split(string(out), "\n") {
ret.ProcsTotal++
switch line {
- case "R":
- case "A":
- ret.ProcsRunning++
- case "T":
- ret.ProcsBlocked++
- default:
- continue
+ case "R":
+ case "A":
+ ret.ProcsRunning++
+ case "T":
+ ret.ProcsBlocked++
+ default:
+ continue
}
}
return ret, nil
diff --git a/mem/mem_aix_nocgo.go b/mem/mem_aix_nocgo.go
index 09ffd8e..fc9e492 100644
--- a/mem/mem_aix_nocgo.go
+++ b/mem/mem_aix_nocgo.go
@@ -71,7 +71,7 @@ func callSVMon(ctx context.Context) (*VirtualMemoryStat, *SwapMemoryStat, error)
swap.Total = t * pagesize
}
if t, err := strconv.ParseUint(p[3], 10, 64); err == nil {
- swap.Free = swap.Total - t * pagesize
+ swap.Free = swap.Total - t*pagesize
}
}
break
diff --git a/mem/mem_freebsd.go b/mem/mem_freebsd.go
index 44543ef..9a56785 100644
--- a/mem/mem_freebsd.go
+++ b/mem/mem_freebsd.go
@@ -8,9 +8,8 @@ import (
"errors"
"unsafe"
- "golang.org/x/sys/unix"
-
"github.com/shirou/gopsutil/v3/internal/common"
+ "golang.org/x/sys/unix"
)
func VirtualMemory() (*VirtualMemoryStat, error) {
diff --git a/mem/mem_openbsd.go b/mem/mem_openbsd.go
index 9764492..e37d5ab 100644
--- a/mem/mem_openbsd.go
+++ b/mem/mem_openbsd.go
@@ -9,6 +9,7 @@ import (
"encoding/binary"
"errors"
"fmt"
+
"github.com/shirou/gopsutil/v3/internal/common"
"golang.org/x/sys/unix"
)
diff --git a/net/net_aix_cgo.go b/net/net_aix_cgo.go
index 8cf8c91..8c34f88 100644
--- a/net/net_aix_cgo.go
+++ b/net/net_aix_cgo.go
@@ -18,14 +18,14 @@ func IOCountersWithContext(ctx context.Context, pernic bool) ([]IOCountersStat,
iocounters := make([]IOCountersStat, 0, len(ifs))
for _, netif := range ifs {
n := IOCountersStat{
- Name: netif.Name,
- BytesSent: uint64(netif.OBytes),
- BytesRecv: uint64(netif.IBytes),
+ Name: netif.Name,
+ BytesSent: uint64(netif.OBytes),
+ BytesRecv: uint64(netif.IBytes),
PacketsSent: uint64(netif.OPackets),
PacketsRecv: uint64(netif.IPackets),
- Errin: uint64(netif.OErrors),
- Errout: uint64(netif.IErrors),
- Dropout: uint64(netif.XmitDrops),
+ Errin: uint64(netif.OErrors),
+ Errout: uint64(netif.IErrors),
+ Dropout: uint64(netif.XmitDrops),
}
iocounters = append(iocounters, n)
}
diff --git a/net/net_windows.go b/net/net_windows.go
index 731c8f9..68b26bd 100644
--- a/net/net_windows.go
+++ b/net/net_windows.go
@@ -211,7 +211,8 @@ func IOCountersByFileWithContext(ctx context.Context, pernic bool, filename stri
// Return a list of network connections
// Available kind:
-// reference to netConnectionKindMap
+//
+// reference to netConnectionKindMap
func Connections(kind string) ([]ConnectionStat, error) {
return ConnectionsWithContext(context.Background(), kind)
}
diff --git a/process/process_windows_32bit.go b/process/process_windows_32bit.go
index 982287d..db4d453 100644
--- a/process/process_windows_32bit.go
+++ b/process/process_windows_32bit.go
@@ -8,9 +8,8 @@ import (
"syscall"
"unsafe"
- "golang.org/x/sys/windows"
-
"github.com/shirou/gopsutil/v3/internal/common"
+ "golang.org/x/sys/windows"
)
type PROCESS_MEMORY_COUNTERS struct {