code cleanup

Author: sni

pkg/pdh/pdh.go

@@ -617,7 +617,7 @@ func mszExpandedPathListToStringArr(ptr *uint16) []string {
 	for *(*uint16)(end) != 0 {
 		curr, n := utf16PtrToString((*uint16)(end))
 		result = append(result, curr)
-		end = unsafe.Pointer(uintptr(n+1)*uintptr(unsafe.Sizeof(*ptr)) + uintptr(end)) //
+		end = unsafe.Add(end, (n+1)*int(unsafe.Sizeof(*ptr))) //
 	}
 	return result
 }

pkg/snclient/check_pdh_windows.go

@@ -6,11 +6,10 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"syscall"
 	"time"
-	"unsafe"
 
 	"github.com/consol-monitoring/snclient/pkg/pdh"
+	"golang.org/x/sys/windows"
 )
 
 // Check implements CheckHandler.
@@ -123,7 +122,7 @@ func (c *CheckPDH) collectValuesForAllCounters(hQuery pdh.PDH_HQUERY, counters m
 			if c.OptionalAlias != "" {
 				name = c.OptionalAlias
 			} else {
-				name = strings.Replace(counterPath, "*", utf16PtrToString(fmtValue.SzName), 1)
+				name = strings.Replace(counterPath, "*", windows.UTF16PtrToString(fmtValue.SzName), 1)
 			}
 			entry["name"] = name
 			entry["value"] = fmt.Sprintf("%d", fmtValue.FmtValue.LargeValue)
@@ -195,17 +194,3 @@ func collectLargeValuesArray(hCounter pdh.PDH_HCOUNTER, hQuery pdh.PDH_HQUERY, r
 
 	return filledBuf, ret
 }
-
-func utf16PtrToString(ptr *uint16) string {
-	if ptr == nil {
-		return ""
-	}
-	end := unsafe.Pointer(ptr)
-	charCounter := 0
-	for *(*uint16)(end) != 0 {
-		end = unsafe.Pointer(uintptr(end) + unsafe.Sizeof(*ptr))
-		charCounter++
-	}
-
-	return syscall.UTF16ToString(unsafe.Slice(ptr, charCounter))
-}