Prechádzať zdrojové kódy

Merge pull request #44393 from thaJeztah/pkg_kernel_duplicate_docs

pkg/parsers/kernel: remove duplicate GoDoc and un-export Utsname
Sebastiaan van Stijn 2 rokov pred
rodič
commit
781fd745ed

+ 0 - 2
pkg/parsers/kernel/kernel_unix.go

@@ -1,8 +1,6 @@
 //go:build linux || freebsd || openbsd
 //go:build linux || freebsd || openbsd
 // +build linux freebsd openbsd
 // +build linux freebsd openbsd
 
 
-// Package kernel provides helper function to get, parse and compare kernel
-// versions for different platforms.
 package kernel // import "github.com/docker/docker/pkg/parsers/kernel"
 package kernel // import "github.com/docker/docker/pkg/parsers/kernel"
 
 
 import (
 import (

+ 0 - 5
pkg/parsers/kernel/uname_linux.go

@@ -2,11 +2,6 @@ package kernel // import "github.com/docker/docker/pkg/parsers/kernel"
 
 
 import "golang.org/x/sys/unix"
 import "golang.org/x/sys/unix"
 
 
-// Utsname represents the system name structure.
-// It is passthrough for unix.Utsname in order to make it portable with
-// other platforms where it is not available.
-type Utsname unix.Utsname
-
 func uname() (*unix.Utsname, error) {
 func uname() (*unix.Utsname, error) {
 	uts := &unix.Utsname{}
 	uts := &unix.Utsname{}
 
 

+ 5 - 6
pkg/parsers/kernel/uname_unsupported.go

@@ -7,13 +7,12 @@ import (
 	"errors"
 	"errors"
 )
 )
 
 
-// Utsname represents the system name structure.
-// It is defined here to make it portable as it is available on linux but not
-// on windows.
-type Utsname struct {
+// utsName represents the system name structure. It is defined here to make it
+// portable as it is available on Linux but not on Windows.
+type utsName struct {
 	Release [65]byte
 	Release [65]byte
 }
 }
 
 
-func uname() (*Utsname, error) {
-	return nil, errors.New("Kernel version detection is available only on linux")
+func uname() (*utsName, error) {
+	return nil, errors.New("kernel version detection is only available on linux")
 }
 }