Fix incorrect use of OCI runtime specs-go cgroup dev types

estesp · estesp · commit 553958406907 · 2018-03-08T15:51:16.000-05:00
Not sure why prior Go versions allowed this, but Go 1.10 caught the
Sprintf type mismatches.

Signed-off-by: Phil Estes &lt;estesp@linux.vnet.ibm.com&gt;
diff --git a/devices.go b/devices.go
@@ -74,11 +74,11 @@ func (d *devicesController) Update(path string, resources *specs.LinuxResources)
 }
 
 func deviceString(device specs.LinuxDeviceCgroup) string {
-	return fmt.Sprintf("%c %s:%s %s",
-		&device.Type,
+	return fmt.Sprintf("%s %s:%s %s",
+		device.Type,
 		deviceNumber(device.Major),
 		deviceNumber(device.Minor),
-		&device.Access,
+		device.Access,
 	)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,11 @@ func (d devicesController) Update(path string, resources specs.LinuxResources)`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`func deviceString(device specs.LinuxDeviceCgroup) string {`
`77`		`- return fmt.Sprintf("%c %s:%s %s",`
`78`		`- &device.Type,`
	`77`	`+ return fmt.Sprintf("%s %s:%s %s",`
	`78`	`+ device.Type,`
`79`	`79`	`deviceNumber(device.Major),`
`80`	`80`	`deviceNumber(device.Minor),`
`81`		`- &device.Access,`
	`81`	`+ device.Access,`
`82`	`82`	`)`
`83`	`83`	`}`
`84`	`84`