*: fix platform dependent utils charsToString (#48400)

pingcap · Nov 8, 2023 · 5fdd857 · 5fdd857
1 parent f58e0be
commit 5fdd857
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/pkg/util/sys/linux/BUILD.bazel b/pkg/util/sys/linux/BUILD.bazel
@@ -14,6 +14,7 @@ go_library(
             "@org_golang_x_sys//unix",
         ],
         "@io_bazel_rules_go//go/platform:android": [
+            "@org_golang_x_exp//constraints",
             "@org_golang_x_sys//unix",
         ],
         "@io_bazel_rules_go//go/platform:darwin": [
@@ -35,6 +36,7 @@ go_library(
             "@org_golang_x_sys//unix",
         ],
         "@io_bazel_rules_go//go/platform:linux": [
+            "@org_golang_x_exp//constraints",
             "@org_golang_x_sys//unix",
         ],
         "@io_bazel_rules_go//go/platform:netbsd": [

diff --git a/pkg/util/sys/linux/sys_linux.go b/pkg/util/sys/linux/sys_linux.go
@@ -19,9 +19,22 @@ import (
 	"net"
 	"syscall"
 
+	"golang.org/x/exp/constraints"
 	"golang.org/x/sys/unix"
 )
 
+func charsToString[T constraints.Integer](ca []T) string {
+	s := make([]byte, len(ca))
+	var lens int
+	for ; lens < len(ca); lens++ {
+		if ca[lens] == 0 {
+			break
+		}
+		s[lens] = uint8(ca[lens])
+	}
+	return string(s[0:lens])
+}
+
 // OSVersion returns version info of operation system.
 // e.g. Linux 4.15.0-45-generic.x86_64
 func OSVersion() (osVersion string, err error) {
@@ -30,17 +43,6 @@ func OSVersion() (osVersion string, err error) {
 	if err != nil {
 		return
 	}
-	charsToString := func(ca []int8) string {
-		s := make([]byte, len(ca))
-		var lens int
-		for ; lens < len(ca); lens++ {
-			if ca[lens] == 0 {
-				break
-			}
-			s[lens] = uint8(ca[lens])
-		}
-		return string(s[0:lens])
-	}
 	osVersion = charsToString(un.Sysname[:]) + " " + charsToString(un.Release[:]) + "." + charsToString(un.Machine[:])
 	return
 }