fix a ambiguity of err in defer func

lifubang · lifubang · commit 29846d18db97 · 2025-03-19T10:55:03.000Z
Signed-off-by: lifubang &lt;lifubang@acmcoder.com&gt;
diff --git a/utils_linux.go b/utils_linux.go
@@ -216,14 +216,13 @@ type runner struct {
 	subCgroupPaths  map[string]string
 }
 
-func (r *runner) run(config *specs.Process) (int, error) {
-	var err error
+func (r *runner) run(config *specs.Process) (_ int, retErr error) {
 	defer func() {
-		if err != nil {
+		if retErr != nil {
 			r.destroy()
 		}
 	}()
-	if err = r.checkTerminal(config); err != nil {
+	if err := r.checkTerminal(config); err != nil {
 		return -1, err
 	}
 	process, err := newProcess(config)

Original file line number	Diff line number	Diff line change
`@@ -216,14 +216,13 @@ type runner struct {`
`216`	`216`	`subCgroupPaths map[string]string`
`217`	`217`	`}`
`218`	`218`
`219`		`-func (r runner) run(config specs.Process) (int, error) {`
`220`		`- var err error`
	`219`	`+func (r runner) run(config specs.Process) (_ int, retErr error) {`
`221`	`220`	`defer func() {`
`222`		`- if err != nil {`
	`221`	`+ if retErr != nil {`
`223`	`222`	`r.destroy()`
`224`	`223`	`}`
`225`	`224`	`}()`
`226`		`- if err = r.checkTerminal(config); err != nil {`
	`225`	`+ if err := r.checkTerminal(config); err != nil {`
`227`	`226`	`return -1, err`
`228`	`227`	`}`
`229`	`228`	`process, err := newProcess(config)`