Compare commits

..

No commits in common. 'e2a7a9964d415dfac1ef26fbca87d33bf1fbd29e' and 'b7c02adb2da328c52ea54826595b3c8239b149b6' have entirely different histories.

@ -34,7 +34,6 @@ build_test: ## test only buildable
GOOS=netbsd go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=openbsd go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=plan9 go test ./... | $(BUILD_FAIL_PATTERN)
CGO_ENABLED=0 GOOS=aix GOARCH=ppc64 go test ./... | $(BUILD_FAIL_PATTERN)
ifeq ($(shell uname -s), Darwin)
CGO_ENABLED=1 GOOS=darwin go test ./... | $(BUILD_FAIL_PATTERN)
@ -78,8 +77,6 @@ vet:
GOOS=plan9 GOARCH=amd64 go vet ./...
GOOS=plan9 GOARCH=386 go vet ./...
CGO_ENABLED=0 GOOS=aix GOARCH=ppc64 go vet ./...
macos_test:
CGO_ENABLED=0 GOOS=darwin go test ./... | $(BUILD_FAIL_PATTERN)
CGO_ENABLED=1 GOOS=darwin go test ./... | $(BUILD_FAIL_PATTERN)

@ -110,7 +110,7 @@ func parseUptime(uptime string) uint64 {
if err != nil {
return 0
}
case ut[3] == "mins,":
case ut[3] == "mins," || ut[3] == "mins,":
mins, err = strconv.ParseUint(ut[2], 10, 64)
if err != nil {
return 0

@ -30,7 +30,7 @@ func IOCountersWithContext(ctx context.Context, pernic bool) ([]IOCountersStat,
iocounters = append(iocounters, n)
}
if pernic == false {
return getIOCountersAll(iocounters), nil
return getIOCountersAll(iocounters)
}
return iocounters, nil
}

@ -89,7 +89,7 @@ func IOCountersWithContext(ctx context.Context, pernic bool) ([]IOCountersStat,
return nil, err
}
if pernic == false {
return getIOCountersAll(iocounters), nil
return getIOCountersAll(iocounters)
}
return iocounters, nil
}

Loading…
Cancel
Save