RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util/runtime: use ByteSliceToString from golang.org/x/sys/unix in Uname (#11070) 

Use unix.ByteSliceToString to convert Utsname []byte fields to strings.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
This commit is contained in:
Tobias Klauser 2022-07-30 19:35:03 +02:00 committed by GitHub
parent be330ac035
commit 7ef6f287cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/runtime/uname_linux.go
View File

@ -13,11 +13,7 @@
package runtime
import (
"bytes"
"golang.org/x/sys/unix"
)
import "golang.org/x/sys/unix"
// Uname returns the uname of the host machine.
func Uname() string {
@ -27,11 +23,11 @@ func Uname() string {
panic("unix.Uname failed: " + err.Error())
}
str := "(" + string(buf.Sysname[:bytes.IndexByte(buf.Sysname[:], 0)])
str += " " + string(buf.Release[:bytes.IndexByte(buf.Release[:], 0)])
str += " " + string(buf.Version[:bytes.IndexByte(buf.Version[:], 0)])
str += " " + string(buf.Machine[:bytes.IndexByte(buf.Machine[:], 0)])
str += " " + string(buf.Nodename[:bytes.IndexByte(buf.Nodename[:], 0)])
str += " " + string(buf.Domainname[:bytes.IndexByte(buf.Domainname[:], 0)]) + ")"
str := "(" + unix.ByteSliceToString(buf.Sysname[:])
str += " " + unix.ByteSliceToString(buf.Release[:])
str += " " + unix.ByteSliceToString(buf.Version[:])
str += " " + unix.ByteSliceToString(buf.Machine[:])
str += " " + unix.ByteSliceToString(buf.Nodename[:])
str += " " + unix.ByteSliceToString(buf.Domainname[:]) + ")"
return str
}