1. docker
  2. Commit bae3023eef0ed8e0eb517ca53f6f97f1bf6786d3
Browse code

client.StatusError don't be returned as a pointer

closes #12373

1. remove & from client.StatusError
2. remove * from Error method

Signed-off-by: Deshi Xiao <xiaods@gmail.com>

Deshi Xiao authored on 2015/04/15 17:57:52
Showing 8 changed files
api/client/attach.go
History View file @ bae3023
... ... 
@@ -80,7 +80,7 @@ func (cli *DockerCli) CmdAttach(args ...string) error {
80 80 
 		return err
81 81 
 	}
82 82 
 	if status != 0 {
83 
-		return &StatusError{StatusCode: status}
83 
+		return StatusError{StatusCode: status}
84 84 
 	}
85 85
86 86 
 	return nil
api/client/build.go
History View file @ bae3023
... ... 
@@ -302,7 +302,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
302 302 
 		if jerr.Code == 0 {
303 303 
 			jerr.Code = 1
304 304 
 		}
305 
-		return &StatusError{Status: jerr.Message, StatusCode: jerr.Code}
305 
+		return StatusError{Status: jerr.Message, StatusCode: jerr.Code}
306 306 
 	}
307 307 
 	return err
308 308 
 }
api/client/client.go
History View file @ bae3023
... ... 
@@ -12,6 +12,6 @@ type StatusError struct {
12 12 
 	StatusCode int
13 13 
 }
14 14
15 
-func (e *StatusError) Error() string {
15 
+func (e StatusError) Error() string {
16 16 
 	return fmt.Sprintf("Status: %s, Code: %d", e.Status, e.StatusCode)
17 17 
 }
api/client/exec.go
History View file @ bae3023
... ... 
@@ -20,7 +20,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {
20 20 
 	execConfig, err := runconfig.ParseExec(cmd, args)
21 21 
 	// just in case the ParseExec does not exit
22 22 
 	if execConfig.Container == "" || err != nil {
23 
-		return &StatusError{StatusCode: 1}
23 
+		return StatusError{StatusCode: 1}
24 24 
 	}
25 25
26 26 
 	stream, _, err := cli.call("POST", "/containers/"+execConfig.Container+"/exec", execConfig, nil)
... ... 
@@ -121,7 +121,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {
121 121 
 	}
122 122
123 123 
 	if status != 0 {
124 
-		return &StatusError{StatusCode: status}
124 
+		return StatusError{StatusCode: status}
125 125 
 	}
126 126
127 127 
 	return nil
api/client/inspect.go
History View file @ bae3023
... ... 
@@ -26,7 +26,7 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
26 26 
 		var err error
27 27 
 		if tmpl, err = template.New("").Funcs(funcMap).Parse(*tmplStr); err != nil {
28 28 
 			fmt.Fprintf(cli.err, "Template parsing error: %v\n", err)
29 
-			return &StatusError{StatusCode: 64,
29 
+			return StatusError{StatusCode: 64,
30 30 
 				Status: "Template parsing error: " + err.Error()}
31 31 
 		}
32 32 
 	}
... ... 
@@ -85,7 +85,7 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
85 85 
 	}
86 86
87 87 
 	if status != 0 {
88 
-		return &StatusError{StatusCode: status}
88 
+		return StatusError{StatusCode: status}
89 89 
 	}
90 90 
 	return nil
91 91 
 }
api/client/run.go
History View file @ bae3023
... ... 
@@ -241,7 +241,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
241 241 
 		}
242 242 
 	}
243 243 
 	if status != 0 {
244 
-		return &StatusError{StatusCode: status}
244 
+		return StatusError{StatusCode: status}
245 245 
 	}
246 246 
 	return nil
247 247 
 }
api/client/start.go
History View file @ bae3023
... ... 
@@ -155,7 +155,7 @@ func (cli *DockerCli) CmdStart(args ...string) error {
155 155 
 			return err
156 156 
 		}
157 157 
 		if status != 0 {
158 
-			return &StatusError{StatusCode: status}
158 
+			return StatusError{StatusCode: status}
159 159 
 		}
160 160 
 	}
161 161 
 	return nil
docker/docker.go
History View file @ bae3023
... ... 
@@ -135,7 +135,7 @@ func main() {
135 135 
 	}
136 136
137 137 
 	if err := cli.Cmd(flag.Args()...); err != nil {
138 
-		if sterr, ok := err.(*client.StatusError); ok {
138 
+		if sterr, ok := err.(client.StatusError); ok {
139 139 
 			if sterr.Status != "" {
140 140 
 				logrus.Println(sterr.Status)
141 141 
 			}