libcontainer/system: un-export UIDMapInUserNS()

thaJeztah · thaJeztah · commit e7fd383bce14 · 2021-04-04T22:42:02.000+02:00
`UIDMapInUserNS()` is not used anywhere, only internally. so un-export it.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/libcontainer/system/linux.go b/libcontainer/system/linux.go
@@ -100,12 +100,12 @@ func RunningInUserNS() bool {
 			// This kernel-provided file only exists if user namespaces are supported
 			return
 		}
-		inUserNS = UIDMapInUserNS(uidmap)
+		inUserNS = uidMapInUserNS(uidmap)
 	})
 	return inUserNS
 }
 
-func UIDMapInUserNS(uidmap []user.IDMap) bool {
+func uidMapInUserNS(uidmap []user.IDMap) bool {
 	/*
 	 * We assume we are in the initial user namespace if we have a full
 	 * range - 4294967295 uids starting at uid 0.
diff --git a/libcontainer/system/linux_test.go b/libcontainer/system/linux_test.go
@@ -37,7 +37,7 @@ func TestUIDMapInUserNS(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		actual := UIDMapInUserNS(uidmap)
+		actual := uidMapInUserNS(uidmap)
 		if c.expected != actual {
 			t.Fatalf("expected %v, got %v for %q", c.expected, actual, c.s)
 		}
diff --git a/libcontainer/system/system_fuzzer.go b/libcontainer/system/system_fuzzer.go
@@ -10,6 +10,6 @@ import (
 
 func FuzzUIDMap(data []byte) int {
 	uidmap, _ := user.ParseIDMap(strings.NewReader(string(data)))
-	_ = UIDMapInUserNS(uidmap)
+	_ = uidMapInUserNS(uidmap)
 	return 1
 }
diff --git a/libcontainer/system/unsupported.go b/libcontainer/system/unsupported.go
@@ -12,8 +12,8 @@ func RunningInUserNS() bool {
 	return false
 }
 
-// UIDMapInUserNS is a stub for non-Linux systems
+// uidMapInUserNS is a stub for non-Linux systems
 // Always returns false
-func UIDMapInUserNS(uidmap []user.IDMap) bool {
+func uidMapInUserNS(uidmap []user.IDMap) bool {
 	return false
 }

Original file line number	Diff line number	Diff line change
`@@ -100,12 +100,12 @@ func RunningInUserNS() bool {`
`100`	`100`	`// This kernel-provided file only exists if user namespaces are supported`
`101`	`101`	`return`
`102`	`102`	`}`
`103`		`- inUserNS = UIDMapInUserNS(uidmap)`
	`103`	`+ inUserNS = uidMapInUserNS(uidmap)`
`104`	`104`	`})`
`105`	`105`	`return inUserNS`
`106`	`106`	`}`
`107`	`107`
`108`		`-func UIDMapInUserNS(uidmap []user.IDMap) bool {`
	`108`	`+func uidMapInUserNS(uidmap []user.IDMap) bool {`
`109`	`109`	`/*`
`110`	`110`	`* We assume we are in the initial user namespace if we have a full`
`111`	`111`	`* range - 4294967295 uids starting at uid 0.`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func TestUIDMapInUserNS(t *testing.T) {`
`37`	`37`	`if err != nil {`
`38`	`38`	`t.Fatal(err)`
`39`	`39`	`}`
`40`		`- actual := UIDMapInUserNS(uidmap)`
	`40`	`+ actual := uidMapInUserNS(uidmap)`
`41`	`41`	`if c.expected != actual {`
`42`	`42`	`t.Fatalf("expected %v, got %v for %q", c.expected, actual, c.s)`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ import (`
`10`	`10`
`11`	`11`	`func FuzzUIDMap(data []byte) int {`
`12`	`12`	`uidmap, _ := user.ParseIDMap(strings.NewReader(string(data)))`
`13`		`- _ = UIDMapInUserNS(uidmap)`
	`13`	`+ _ = uidMapInUserNS(uidmap)`
`14`	`14`	`return 1`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ func RunningInUserNS() bool {`
`12`	`12`	`return false`
`13`	`13`	`}`
`14`	`14`
`15`		`-// UIDMapInUserNS is a stub for non-Linux systems`
	`15`	`+// uidMapInUserNS is a stub for non-Linux systems`
`16`	`16`	`// Always returns false`
`17`		`-func UIDMapInUserNS(uidmap []user.IDMap) bool {`
	`17`	`+func uidMapInUserNS(uidmap []user.IDMap) bool {`
`18`	`18`	`return false`
`19`	`19`	`}`