diff --git a/ps.go b/ps.go index f285c22e..228f161a 100644 --- a/ps.go +++ b/ps.go @@ -39,10 +39,7 @@ var psCommand = cli.Command{ } if context.String("format") == "json" { - if err := json.NewEncoder(os.Stdout).Encode(pids); err != nil { - return err - } - return nil + return json.NewEncoder(os.Stdout).Encode(pids) } // [1:] is to remove command name, ex: diff --git a/tty.go b/tty.go index a3244342..0baed5a4 100644 --- a/tty.go +++ b/tty.go @@ -108,10 +108,7 @@ func (t *tty) sendtty(socket *os.File, ti *libcontainer.TerminalInfo) error { // Create a fake file to contain the terminal info. console := os.NewFile(t.console.File().Fd(), ti.String()) - if err := utils.SendFd(socket, console); err != nil { - return err - } - return nil + return utils.SendFd(socket, console) } // ClosePostStart closes any fds that are provided to the container and dup2'd diff --git a/update.go b/update.go index 1c126440..cecd9986 100644 --- a/update.go +++ b/update.go @@ -224,9 +224,6 @@ other options are ignored. config.Cgroups.Resources.MemoryReservation = int64(*r.Memory.Reservation) config.Cgroups.Resources.MemorySwap = int64(*r.Memory.Swap) - if err := container.Set(config); err != nil { - return err - } - return nil + return container.Set(config) }, } diff --git a/utils.go b/utils.go index 8d30cfdf..ce610440 100644 --- a/utils.go +++ b/utils.go @@ -80,9 +80,5 @@ func revisePidFile(context *cli.Context) error { if err != nil { return err } - err = context.Set("pid-file", pidFile) - if err != nil { - return err - } - return nil + return context.Set("pid-file", pidFile) }