Merge pull request #1911 from theSuess/linter-fixes

Various cleanups to address linter issues
This commit is contained in:
Michael Crosby
2018-11-13 12:13:34 -05:00
committed by GitHub
16 changed files with 23 additions and 78 deletions
+2 -10
View File
@@ -220,11 +220,7 @@ func syncParentReady(pipe io.ReadWriter) error {
}
// Wait for parent to give the all-clear.
if err := readSync(pipe, procRun); err != nil {
return err
}
return nil
return readSync(pipe, procRun)
}
// syncParentHooks sends to the given pipe a JSON payload which indicates that
@@ -237,11 +233,7 @@ func syncParentHooks(pipe io.ReadWriter) error {
}
// Wait for parent to give the all-clear.
if err := readSync(pipe, procResume); err != nil {
return err
}
return nil
return readSync(pipe, procResume)
}
// setupUser changes the groups, gid, and uid for the user inside the container