From a0804e8e118510dc49e7e74273a323e99c097a3d Mon Sep 17 00:00:00 2001 From: Hu Keping Date: Wed, 15 Apr 2015 00:29:53 +0800 Subject: [PATCH] Use local variable err instead of a outer one Signed-off-by: Hu Keping --- api/server/server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/server/server.go b/api/server/server.go index 7ed3abc889..b8ac0e9371 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -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 { - var err error - if err = parseForm(r); err != nil { + if err := parseForm(r); err != nil { return err } @@ -520,10 +519,11 @@ func getContainersJSON(eng *engine.Engine, version version.Version, w http.Respo } if tmpLimit := r.Form.Get("limit"); tmpLimit != "" { - config.Limit, err = strconv.Atoi(tmpLimit) + limit, err := strconv.Atoi(tmpLimit) if err != nil { return err } + config.Limit = limit } containers, err := getDaemon(eng).Containers(config)