libct/(*setnsProcess).Start: use retErr

kolyshkin · kolyshkin · commit 8699596dcef5 · 2020-09-29T18:38:31.000-07:00
It is not a good practice to have the name `err` for the error returned
by a function.  Switch to `retErr`.

Signed-off-by: Kir Kolyshkin &lt;kolyshkin@gmail.com&gt;
diff --git a/libcontainer/process_linux.go b/libcontainer/process_linux.go
@@ -86,9 +86,9 @@ func (p *setnsProcess) signal(sig os.Signal) error {
 	return unix.Kill(p.pid(), s)
 }
 
-func (p *setnsProcess) start() (err error) {
+func (p *setnsProcess) start() (retErr error) {
 	defer p.messageSockPair.parent.Close()
-	err = p.cmd.Start()
+	err := p.cmd.Start()
 	// close the write-side of the pipes (controlled by child)
 	p.messageSockPair.child.Close()
 	p.logFilePair.child.Close()
@@ -100,7 +100,7 @@ func (p *setnsProcess) start() (err error) {
 			return newSystemErrorWithCause(err, "copying bootstrap data to pipe")
 		}
 	}
-	if err = p.execSetns(); err != nil {
+	if err := p.execSetns(); err != nil {
 		return newSystemErrorWithCause(err, "executing setns process")
 	}
 	if len(p.cgroupPaths) > 0 {

Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,9 @@ func (p *setnsProcess) signal(sig os.Signal) error {`
`86`	`86`	`return unix.Kill(p.pid(), s)`
`87`	`87`	`}`
`88`	`88`
`89`		`-func (p *setnsProcess) start() (err error) {`
	`89`	`+func (p *setnsProcess) start() (retErr error) {`
`90`	`90`	`defer p.messageSockPair.parent.Close()`
`91`		`- err = p.cmd.Start()`
	`91`	`+ err := p.cmd.Start()`
`92`	`92`	`// close the write-side of the pipes (controlled by child)`
`93`	`93`	`p.messageSockPair.child.Close()`
`94`	`94`	`p.logFilePair.child.Close()`
`@@ -100,7 +100,7 @@ func (p *setnsProcess) start() (err error) {`
`100`	`100`	`return newSystemErrorWithCause(err, "copying bootstrap data to pipe")`
`101`	`101`	`}`
`102`	`102`	`}`
`103`		`- if err = p.execSetns(); err != nil {`
	`103`	`+ if err := p.execSetns(); err != nil {`
`104`	`104`	`return newSystemErrorWithCause(err, "executing setns process")`
`105`	`105`	`}`
`106`	`106`	`if len(p.cgroupPaths) > 0 {`