Merge pull request #1257 from mrunalp/fix_warnings

Simplify error handling on function return

exec.go

@@ -178,9 +178,8 @@ func getProcess(context *cli.Context, bundle string) (*specs.Process, error) {
 		p.Capabilities = caps
 	}
 	// append the passed env variables
-	for _, e := range context.StringSlice("env") {
-		p.Env = append(p.Env, e)
-	}
+	p.Env = append(p.Env, context.StringSlice("env")...)
+
 	// set the tty
 	if context.IsSet("tty") {
 		p.Terminal = context.Bool("tty")

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:

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

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)
 	},
 }

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)
 }