mount: mount.PID(), mount.Self(): change signature to return pointers

thaJeztah · thaJeztah · commit 43578a9d6e04 · 2021-01-08T17:31:53.000+01:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/mount/mountinfo.go b/mount/mountinfo.go
@@ -21,11 +21,3 @@ import "github.com/moby/sys/mountinfo"
 // Info reveals information about a particular mounted filesystem. This
 // struct is populated from the content in the /proc/<pid>/mountinfo file.
 type Info = mountinfo.Info
-
-func fromMountinfoSlice(infos []*mountinfo.Info) []Info {
-	out := make([]Info, len(infos))
-	for i, v := range infos {
-		out[i] = *v
-	}
-	return out
-}
diff --git a/mount/mountinfo_bsd.go b/mount/mountinfo_bsd.go
@@ -26,12 +26,11 @@ import (
 )
 
 // Self retrieves a list of mounts for the current running process.
-func Self() ([]Info, error) {
-	m, err := mountinfo.GetMounts(nil)
-	return fromMountinfoSlice(m), err
+func Self() ([]*Info, error) {
+	return mountinfo.GetMounts(nil)
 }
 
 // PID collects the mounts for a specific process ID.
-func PID(pid int) ([]Info, error) {
+func PID(pid int) ([]*Info, error) {
 	return nil, fmt.Errorf("mountinfo.PID is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
 }
diff --git a/mount/mountinfo_linux.go b/mount/mountinfo_linux.go
@@ -23,15 +23,13 @@ import (
 )
 
 // Self retrieves a list of mounts for the current running process.
-func Self() ([]Info, error) {
-	m, err := mountinfo.GetMounts(nil)
-	return fromMountinfoSlice(m), err
+func Self() ([]*Info, error) {
+	return mountinfo.GetMounts(nil)
 }
 
 // PID collects the mounts for a specific process ID. If the process
 // ID is unknown, it is better to use `Self` which will inspect
 // "/proc/self/mountinfo" instead.
-func PID(pid int) ([]Info, error) {
-	m, err := mountinfo.PidMountInfo(pid)
-	return fromMountinfoSlice(m), err
+func PID(pid int) ([]*Info, error) {
+	return mountinfo.PidMountInfo(pid)
 }
diff --git a/mount/mountinfo_unsupported.go b/mount/mountinfo_unsupported.go
@@ -24,11 +24,11 @@ import (
 )
 
 // Self retrieves a list of mounts for the current running process.
-func Self() ([]Info, error) {
+func Self() ([]*Info, error) {
 	return nil, fmt.Errorf("mountinfo.Self is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
 }
 
 // PID collects the mounts for a specific process ID.
-func PID(pid int) ([]Info, error) {
+func PID(pid int) ([]*Info, error) {
 	return nil, fmt.Errorf("mountinfo.PID is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
 }

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,11 @@ import (`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`// Self retrieves a list of mounts for the current running process.`
`29`		`-func Self() ([]Info, error) {`
`30`		`- m, err := mountinfo.GetMounts(nil)`
`31`		`- return fromMountinfoSlice(m), err`
	`29`	`+func Self() ([]*Info, error) {`
	`30`	`+ return mountinfo.GetMounts(nil)`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`// PID collects the mounts for a specific process ID.`
`35`		`-func PID(pid int) ([]Info, error) {`
	`34`	`+func PID(pid int) ([]*Info, error) {`
`36`	`35`	`return nil, fmt.Errorf("mountinfo.PID is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,13 @@ import (`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`// Self retrieves a list of mounts for the current running process.`
`26`		`-func Self() ([]Info, error) {`
`27`		`- m, err := mountinfo.GetMounts(nil)`
`28`		`- return fromMountinfoSlice(m), err`
	`26`	`+func Self() ([]*Info, error) {`
	`27`	`+ return mountinfo.GetMounts(nil)`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`// PID collects the mounts for a specific process ID. If the process`
`32`	`31`	// ID is unknown, it is better to use `Self` which will inspect
`33`	`32`	`// "/proc/self/mountinfo" instead.`
`34`		`-func PID(pid int) ([]Info, error) {`
`35`		`- m, err := mountinfo.PidMountInfo(pid)`
`36`		`- return fromMountinfoSlice(m), err`
	`33`	`+func PID(pid int) ([]*Info, error) {`
	`34`	`+ return mountinfo.PidMountInfo(pid)`
`37`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@ import (`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`// Self retrieves a list of mounts for the current running process.`
`27`		`-func Self() ([]Info, error) {`
	`27`	`+func Self() ([]*Info, error) {`
`28`	`28`	`return nil, fmt.Errorf("mountinfo.Self is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// PID collects the mounts for a specific process ID.`
`32`		`-func PID(pid int) ([]Info, error) {`
	`32`	`+func PID(pid int) ([]*Info, error) {`
`33`	`33`	`return nil, fmt.Errorf("mountinfo.PID is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)`
`34`	`34`	`}`