chore: quick tidy-up of string ops

nixpig · Nov 24, 2024 · 47c69b4 · 47c69b4
1 parent eca8ae9
commit 47c69b4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/container/container.go b/container/container.go
@@ -303,7 +303,7 @@ func (c *Container) ID() string {
 }
 
 func (c *Container) Rootfs() string {
-	if strings.Index(c.Spec.Root.Path, "/") == 0 {
+	if strings.HasPrefix(c.Spec.Root.Path, "/") {
 		return c.Spec.Root.Path
 	}
 

diff --git a/container/filesystem/devices.go b/container/filesystem/devices.go
@@ -96,13 +96,7 @@ func mountDefaultDevices(rootfs string) error {
 func mountSpecDevices(devices []specs.LinuxDevice, rootfs string) error {
 	for _, dev := range devices {
 
-		var absPath string
-		if strings.Index(dev.Path, "/") == 0 {
-			relPath := strings.TrimPrefix(dev.Path, "/")
-			absPath = filepath.Join(rootfs, relPath)
-		} else {
-			absPath = filepath.Join(rootfs, dev.Path)
-		}
+		absPath := filepath.Join(rootfs, strings.TrimPrefix(dev.Path, "/"))
 
 		dt := map[string]uint32{
 			"b": unix.S_IFBLK,

diff --git a/container/filesystem/filesystem.go b/container/filesystem/filesystem.go
@@ -89,13 +89,7 @@ func devIsInSpec(mounts []specs.Mount, dev string) bool {
 
 func mountDevices(devices []specs.LinuxDevice, rootfs string) error {
 	for _, dev := range devices {
-		var absPath string
-		if strings.Index(dev.Path, "/") == 0 {
-			relPath := strings.TrimPrefix(dev.Path, "/")
-			absPath = filepath.Join(rootfs, relPath)
-		} else {
-			absPath = filepath.Join(rootfs, dev.Path)
-		}
+		absPath := filepath.Join(rootfs, strings.TrimPrefix(dev.Path, "/"))
 
 		if _, err := os.Stat(absPath); os.IsNotExist(err) {
 			f, err := os.Create(absPath)