Typo fixed and simple code.

xuri · xuri · commit 87e8a936e82e · 2017-10-18T10:26:58.000+08:00
Signed-off-by: Ri Xu &lt;xuri@360.net&gt;
diff --git a/builder/dockerfile/instructions/commands.go b/builder/dockerfile/instructions/commands.go
@@ -9,7 +9,7 @@ import (
 	"github.com/docker/docker/api/types/strslice"
 )
 
-// KeyValuePair represent an arbitrary named value (usefull in slice insted of map[string] string to preserve ordering)
+// KeyValuePair represent an arbitrary named value (useful in slice insted of map[string] string to preserve ordering)
 type KeyValuePair struct {
 	Key   string
 	Value string
diff --git a/builder/dockerfile/instructions/parse.go b/builder/dockerfile/instructions/parse.go
@@ -105,7 +105,7 @@ func ParseCommand(node *parser.Node) (Command, error) {
 	return nil, errors.Errorf("%T is not a command type", s)
 }
 
-// UnknownInstruction represents an error occuring when a command is unresolvable
+// UnknownInstruction represents an error occurring when a command is unresolvable
 type UnknownInstruction struct {
 	Line        int
 	Instruction string
diff --git a/daemon/network/settings.go b/daemon/network/settings.go
@@ -42,7 +42,7 @@ type AttachmentStore struct {
 	networkToNodeLBIP map[string]net.IP
 }
 
-// ResetAttachments clears any exsiting load balancer IP to network mapping and
+// ResetAttachments clears any existing load balancer IP to network mapping and
 // sets the mapping to the given attachments.
 func (store *AttachmentStore) ResetAttachments(attachments map[string]string) error {
 	store.ClearAttachments()
diff --git a/integration-cli/check_test.go b/integration-cli/check_test.go
@@ -333,7 +333,7 @@ func (s *DockerSwarmSuite) AddDaemon(c *check.C, joinSwarm, manager bool) *daemo
 	args := []string{"--iptables=false", "--swarm-default-advertise-addr=lo"} // avoid networking conflicts
 	d.StartWithBusybox(c, args...)
 
-	if joinSwarm == true {
+	if joinSwarm {
 		if len(s.daemons) > 0 {
 			tokens := s.daemons[0].JoinTokens(c)
 			token := tokens.Worker
diff --git a/integration-cli/docker_api_ipcmode_test.go b/integration-cli/docker_api_ipcmode_test.go
@@ -44,11 +44,7 @@ func testIpcCheckDevExists(mm string) (bool, error) {
 		}
 	}
 
-	if err := s.Err(); err != nil {
-		return false, err
-	}
-
-	return false, nil
+	return false, s.Err()
 }
 
 // testIpcNonePrivateShareable is a helper function to test "none",
diff --git a/volume/linux_parser.go b/volume/linux_parser.go
@@ -42,7 +42,7 @@ func linuxValidateAbsolute(p string) error {
 }
 func (p *linuxParser) validateMountConfig(mnt *mount.Mount) error {
 	// there was something looking like a bug in existing codebase:
-	// - validateMountConfig on linux was called with options skipping bind source existance when calling ParseMountRaw
+	// - validateMountConfig on linux was called with options skipping bind source existence when calling ParseMountRaw
 	// - but not when calling ParseMountSpec directly... nor when the unit test called it directly
 	return p.validateMountConfigImpl(mnt, true)
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/docker/docker/api/types/strslice"`
`10`	`10`	`)`
`11`	`11`
`12`		`-// KeyValuePair represent an arbitrary named value (usefull in slice insted of map[string] string to preserve ordering)`
	`12`	`+// KeyValuePair represent an arbitrary named value (useful in slice insted of map[string] string to preserve ordering)`
`13`	`13`	`type KeyValuePair struct {`
`14`	`14`	`Key string`
`15`	`15`	`Value string`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ func ParseCommand(node *parser.Node) (Command, error) {`
`105`	`105`	`return nil, errors.Errorf("%T is not a command type", s)`
`106`	`106`	`}`
`107`	`107`
`108`		`-// UnknownInstruction represents an error occuring when a command is unresolvable`
	`108`	`+// UnknownInstruction represents an error occurring when a command is unresolvable`
`109`	`109`	`type UnknownInstruction struct {`
`110`	`110`	`Line int`
`111`	`111`	`Instruction string`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ type AttachmentStore struct {`
`42`	`42`	`networkToNodeLBIP map[string]net.IP`
`43`	`43`	`}`
`44`	`44`
`45`		`-// ResetAttachments clears any exsiting load balancer IP to network mapping and`
	`45`	`+// ResetAttachments clears any existing load balancer IP to network mapping and`
`46`	`46`	`// sets the mapping to the given attachments.`
`47`	`47`	`func (store *AttachmentStore) ResetAttachments(attachments map[string]string) error {`
`48`	`48`	`store.ClearAttachments()`
Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,7 @@ func testIpcCheckDevExists(mm string) (bool, error) {`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`- if err := s.Err(); err != nil {`
`48`		`- return false, err`
`49`		`- }`
`50`		`-`
`51`		`- return false, nil`
	`47`	`+ return false, s.Err()`
`52`	`48`	`}`
`53`	`49`
`54`	`50`	`// testIpcNonePrivateShareable is a helper function to test "none",`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func linuxValidateAbsolute(p string) error {`
`42`	`42`	`}`
`43`	`43`	`func (p linuxParser) validateMountConfig(mnt mount.Mount) error {`
`44`	`44`	`// there was something looking like a bug in existing codebase:`
`45`		`- // - validateMountConfig on linux was called with options skipping bind source existance when calling ParseMountRaw`
	`45`	`+ // - validateMountConfig on linux was called with options skipping bind source existence when calling ParseMountRaw`
`46`	`46`	`// - but not when calling ParseMountSpec directly... nor when the unit test called it directly`
`47`	`47`	`return p.validateMountConfigImpl(mnt, true)`
`48`	`48`	`}`