Merge pull request #310 from sparrc/go-fmt

run go fmt ./...

cpu/cpu_linux.go

@@ -97,7 +97,7 @@ func finishCPUInfo(c *InfoStat) error {
 			return nil
 		}
 	}
-	c.Mhz = value/1000.0  // value is in kHz
+	c.Mhz = value / 1000.0 // value is in kHz
 	return nil
 }
 

mem/mem_openbsd.go

@@ -7,8 +7,8 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"os/exec"
 	"github.com/shirou/gopsutil/internal/common"
+	"os/exec"
 )
 
 func GetPageSize() (uint64, error) {

mem/types_openbsd.go

@@ -4,7 +4,6 @@
 Input to cgo -godefs.
 */
 
-
 package mem
 
 /*
@@ -31,7 +30,5 @@ const (
 	sizeOfBcachestats = C.sizeof_struct_bcachestats
 )
 
-
 type Uvmexp C.struct_uvmexp
 type Bcachestats C.struct_bcachestats
-

net/net_darwin.go

@@ -222,7 +222,7 @@ func IOCounters(pernic bool) ([]IOCountersStat, error) {
 			}
 			if truncated {
 				// run netstat with -I$ifacename
-				if out, err = invoke.Command(netstat, "-ibdnWI" + interfaceName);err != nil {
+				if out, err = invoke.Command(netstat, "-ibdnWI"+interfaceName); err != nil {
 					return nil, err
 				}
 				parsedIfaces, err := parseNetstatOutput(string(out))

net/net_darwin_test.go

@@ -43,7 +43,7 @@ func assertLoopbackStat(t *testing.T, err error, stat *IOCountersStat) {
 	assert.Equal(t, 869107, stat.PacketsRecv)
 	assert.Equal(t, 0, stat.Errin)
 	assert.Equal(t, 169411755, stat.BytesRecv)
-	assert.Equal(t,869108,  stat.PacketsSent)
+	assert.Equal(t, 869108, stat.PacketsSent)
 	assert.Equal(t, 1, stat.Errout)
 	assert.Equal(t, 169411756, stat.BytesSent)
 }
@@ -119,19 +119,19 @@ func TestParseNetstatTruncated(t *testing.T) {
 	assert.Equal(t, truncatedIface, nsInterfaces[6].stat.Name)
 
 	assert.NotNil(t, nsInterfaces[7].linkId)
-	assert.Equal(t,uint(90), *nsInterfaces[7].linkId)
+	assert.Equal(t, uint(90), *nsInterfaces[7].linkId)
 	assert.Equal(t, truncatedIface, nsInterfaces[7].stat.Name)
 
 	assert.NotNil(t, nsInterfaces[8].linkId)
-	assert.Equal(t, uint(92), *nsInterfaces[8].linkId )
+	assert.Equal(t, uint(92), *nsInterfaces[8].linkId)
 	assert.Equal(t, truncatedIface, nsInterfaces[8].stat.Name)
 
 	assert.NotNil(t, nsInterfaces[9].linkId)
-	assert.Equal(t, uint(93), *nsInterfaces[9].linkId )
+	assert.Equal(t, uint(93), *nsInterfaces[9].linkId)
 	assert.Equal(t, truncatedIface, nsInterfaces[9].stat.Name)
 
 	assert.NotNil(t, nsInterfaces[10].linkId)
-	assert.Equal(t, uint(95), *nsInterfaces[10].linkId )
+	assert.Equal(t, uint(95), *nsInterfaces[10].linkId)
 	assert.Equal(t, truncatedIface, nsInterfaces[10].stat.Name)
 
 	mapUsage := newMapInterfaceNameUsage(nsInterfaces)

net/net_openbsd.go

@@ -12,7 +12,7 @@ import (
 )
 
 func ParseNetstat(output string, mode string,
-	iocs map[string]IOCountersStat) (error) {
+	iocs map[string]IOCountersStat) error {
 	lines := strings.Split(output, "\n")
 
 	exists := make([]string, 0, len(lines)-1)
@@ -72,7 +72,7 @@ func ParseNetstat(output string, mode string,
 
 		n, present := iocs[values[0]]
 		if !present {
-			n = IOCountersStat{Name : values[0]}
+			n = IOCountersStat{Name: values[0]}
 		}
 		if mode == "inb" {
 			n.BytesRecv = parsed[0]

process/process_openbsd.go

@@ -3,8 +3,8 @@
 package process
 
 import (
-	"bytes"
 	"C"
+	"bytes"
 	"encoding/binary"
 	"strings"
 	"syscall"
@@ -12,8 +12,8 @@ import (
 
 	cpu "github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/internal/common"
-	net "github.com/shirou/gopsutil/net"
 	mem "github.com/shirou/gopsutil/mem"
+	net "github.com/shirou/gopsutil/net"
 )
 
 // MemoryInfoExStat is different between OSes
@@ -58,7 +58,7 @@ func (p *Process) Exe() (string, error) {
 }
 
 func (p *Process) CmdlineSlice() ([]string, error) {
-	mib := []int32{CTLKern, KernProcArgs, p.Pid, KernProcArgv }
+	mib := []int32{CTLKern, KernProcArgs, p.Pid, KernProcArgv}
 	buf, _, err := common.CallSyscall(mib)
 
 	if err != nil {
@@ -75,7 +75,7 @@ func (p *Process) CmdlineSlice() ([]string, error) {
 		strParts = append(strParts, C.GoString(argv))
 
 		argc++
-		argv = *(**C.char)(unsafe.Pointer(uintptr(argvp) + uintptr(argc) * size))
+		argv = *(**C.char)(unsafe.Pointer(uintptr(argvp) + uintptr(argc)*size))
 	}
 	return strParts, nil
 }

process/types_openbsd.go

@@ -51,7 +51,6 @@ const (
 	ArgMax = 256 * 1024 // sys/syslimits.h:#define  ARG_MAX
 )
 
-
 const (
 	sizeofPtr      = C.sizeofPtr
 	sizeofShort    = C.sizeof_short