From 713cae7ca2b8a5fa36e25f3fb30531f6400fafc3 Mon Sep 17 00:00:00 2001
From: yuexiao-wang <wang.yuexiao@zte.com.cn>
Date: Thu, 10 Nov 2016 10:39:23 +0800
Subject: [PATCH] Remove redundant parameter and fix typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
---
cli/command/container/exec.go | 5 ++---
cli/command/container/exec_test.go | 7 +++----
cli/command/stack/list.go | 2 +-
docs/reference/commandline/diff.md | 2 +-
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/cli/command/container/exec.go b/cli/command/container/exec.go
index 84eba113cf..4bc8c58066 100644
--- a/cli/command/container/exec.go
+++ b/cli/command/container/exec.go
@@ -65,7 +65,7 @@ func NewExecCommand(dockerCli *command.DockerCli) *cobra.Command {
}
func runExec(dockerCli *command.DockerCli, opts *execOptions, container string, execCmd []string) error {
- execConfig, err := parseExec(opts, container, execCmd)
+ execConfig, err := parseExec(opts, execCmd)
// just in case the ParseExec does not exit
if container == "" || err != nil {
return cli.StatusError{StatusCode: 1}
@@ -181,14 +181,13 @@ func getExecExitCode(ctx context.Context, client apiclient.ContainerAPIClient, e
// parseExec parses the specified args for the specified command and generates
// an ExecConfig from it.
-func parseExec(opts *execOptions, container string, execCmd []string) (*types.ExecConfig, error) {
+func parseExec(opts *execOptions, execCmd []string) (*types.ExecConfig, error) {
execConfig := &types.ExecConfig{
User: opts.user,
Privileged: opts.privileged,
Tty: opts.tty,
Cmd: execCmd,
Detach: opts.detach,
- // container is not used here
}
// If -d is not set, attach to everything by default
diff --git a/cli/command/container/exec_test.go b/cli/command/container/exec_test.go
index 2e122e7386..baeeaf1904 100644
--- a/cli/command/container/exec_test.go
+++ b/cli/command/container/exec_test.go
@@ -7,9 +7,8 @@ import (
)
type arguments struct {
- options execOptions
- container string
- execCmd []string
+ options execOptions
+ execCmd []string
}
func TestParseExec(t *testing.T) {
@@ -73,7 +72,7 @@ func TestParseExec(t *testing.T) {
}
for valid, expectedExecConfig := range valids {
- execConfig, err := parseExec(&valid.options, valid.container, valid.execCmd)
+ execConfig, err := parseExec(&valid.options, valid.execCmd)
if err != nil {
t.Fatal(err)
}
diff --git a/cli/command/stack/list.go b/cli/command/stack/list.go
index f655b929ad..7be42525dd 100644
--- a/cli/command/stack/list.go
+++ b/cli/command/stack/list.go
@@ -72,7 +72,7 @@ func printTable(out io.Writer, stacks []*stack) {
type stack struct {
// Name is the name of the stack
- Name string
+ Name string
// Services is the number of the services
Services int
}
diff --git a/docs/reference/commandline/diff.md b/docs/reference/commandline/diff.md
index ac47e33d3c..be27678dcd 100644
--- a/docs/reference/commandline/diff.md
+++ b/docs/reference/commandline/diff.md
@@ -24,7 +24,7 @@ Options:
--help Print usage
```
-List the changed files and directories in a container᾿s filesystem
+List the changed files and directories in a container᾿s filesystem.
There are 3 events that are listed in the `diff`:
1. `A` - Add