From: Tobias Klauser <tklauser@distanz.ch>
Date: Tue, 9 Aug 2022 08:15:27 +0000 (+0200)
Subject: cmd/internal/osinfo: use unix.ByteSliceToString
X-Git-Tag: go1.20rc1~1555
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c7c78f1a3a4c94043c140962f2916a69e466d255;p=gostls13.git

cmd/internal/osinfo: use unix.ByteSliceToString

The golang.org/x/sys/unix package is already imported for Utsname and
Uname. Use ByteSliceToString from that package as well to replace the
locally defined utsString helper which serves the same purpose and
matches ByteSliceToString's implementation.

Change-Id: I5d9de186a5aeb1feed1387beedefbcd260fe22ff
Reviewed-on: https://go-review.googlesource.com/c/go/+/415654
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
---

diff --git a/src/cmd/internal/osinfo/os_unix.go b/src/cmd/internal/osinfo/os_unix.go
index fab9e08f82..b989f0afb4 100644
--- a/src/cmd/internal/osinfo/os_unix.go
+++ b/src/cmd/internal/osinfo/os_unix.go
@@ -6,19 +6,7 @@
 
 package osinfo
 
-import (
-	"bytes"
-
-	"golang.org/x/sys/unix"
-)
-
-func utsString(b []byte) string {
-	i := bytes.IndexByte(b, 0)
-	if i == -1 {
-		return string(b)
-	}
-	return string(b[:i])
-}
+import "golang.org/x/sys/unix"
 
 // Version returns the OS version name/number.
 func Version() (string, error) {
@@ -27,10 +15,10 @@ func Version() (string, error) {
 		return "", err
 	}
 
-	sysname := utsString(uts.Sysname[:])
-	release := utsString(uts.Release[:])
-	version := utsString(uts.Version[:])
-	machine := utsString(uts.Machine[:])
+	sysname := unix.ByteSliceToString(uts.Sysname[:])
+	release := unix.ByteSliceToString(uts.Release[:])
+	version := unix.ByteSliceToString(uts.Version[:])
+	machine := unix.ByteSliceToString(uts.Machine[:])
 
 	return sysname + " " + release + " " + version + " " + machine, nil
 }