Use local variable err instead of a outer one

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: a0804e8e118510dc49e7e74273a323e99c097a3d
Component: engine
This commit is contained in:
Hu Keping
2015-04-15 00:29:53 +08:00
parent fc9842cd3d
commit 325400d97c

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 {
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)