From 437e81cd69bf1649d45650a335e121d9dfb2ddf7 Mon Sep 17 00:00:00 2001 From: "Aaron.L.Xu" Date: Fri, 10 Feb 2017 15:35:05 +0800 Subject: [PATCH] review code about cmd/* and fix some easy typos :D Signed-off-by: Aaron.L.Xu --- cmd/docker/docker.go | 4 ++-- cmd/dockerd/hack/malformed_host_override.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go index f992b08469..654c7f41d6 100644 --- a/cmd/docker/docker.go +++ b/cmd/docker/docker.go @@ -4,6 +4,7 @@ import ( "errors" "fmt" "os" + "strings" "github.com/Sirupsen/logrus" "github.com/docker/docker/api/types/versions" @@ -17,7 +18,6 @@ import ( "github.com/docker/docker/pkg/term" "github.com/spf13/cobra" "github.com/spf13/pflag" - "strings" ) func newDockerCommand(dockerCli *command.DockerCli) *cobra.Command { @@ -55,7 +55,7 @@ func newDockerCommand(dockerCli *command.DockerCli) *cobra.Command { cli.SetupRootCommand(cmd) cmd.SetHelpFunc(func(ccmd *cobra.Command, args []string) { - if dockerCli.Client() == nil { // when using --help, PersistenPreRun is not called, so initialization is needed. + if dockerCli.Client() == nil { // when using --help, PersistentPreRun is not called, so initialization is needed. // flags must be the top-level command flags, not cmd.Flags() opts.Common.SetDefaultOptions(flags) dockerPreRun(opts) diff --git a/cmd/dockerd/hack/malformed_host_override.go b/cmd/dockerd/hack/malformed_host_override.go index d4aa3ddd73..e7175caa0b 100644 --- a/cmd/dockerd/hack/malformed_host_override.go +++ b/cmd/dockerd/hack/malformed_host_override.go @@ -111,7 +111,7 @@ func (l *MalformedHostHeaderOverrideConn) Read(b []byte) (n int, err error) { } // Accept makes the listener accepts connections and wraps the connection -// in a MalformedHostHeaderOverrideConn initilizing first to true. +// in a MalformedHostHeaderOverrideConn initializing first to true. func (l *MalformedHostHeaderOverride) Accept() (net.Conn, error) { c, err := l.Listener.Accept() if err != nil {