docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12365 from HuKeping/list 

Use local variable err instead of a outer one
This commit is contained in:
Brian Goff 2015-04-14 12:49:15 -04:00
parent 398220f5ff a0804e8e11
commit 392fd243bc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/server/server.go
View File

@ -506,8 +506,7 @@ func getContainersTop(eng *engine.Engine, version version.Version, w http.Respon
} }
func getContainersJSON(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error { func getContainersJSON(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
var err error if err := parseForm(r); err != nil {
if err = parseForm(r); err != nil {
return err return err
} }
@ -520,10 +519,11 @@ func getContainersJSON(eng *engine.Engine, version version.Version, w http.Respo
} }
if tmpLimit := r.Form.Get("limit"); tmpLimit != "" { if tmpLimit := r.Form.Get("limit"); tmpLimit != "" {
config.Limit, err = strconv.Atoi(tmpLimit) limit, err := strconv.Atoi(tmpLimit)
if err != nil { if err != nil {
return err return err
} }
config.Limit = limit
} }
containers, err := getDaemon(eng).Containers(config) containers, err := getDaemon(eng).Containers(config)