GitList

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

...	...	@@ -506,8 +506,7 @@ func getContainersTop(eng *engine.Engine, version version.Version, w http.Respon
506	506	}
507	507
508	508	func getContainersJSON(eng engine.Engine, version version.Version, w http.ResponseWriter, r http.Request, vars map[string]string) error {
509		- var err error
510		- if err = parseForm(r); err != nil {
	509	+ if err := parseForm(r); err != nil {
511	510	return err
512	511	}
513	512
...	...	@@ -520,10 +519,11 @@ func getContainersJSON(eng *engine.Engine, version version.Version, w http.Respo
520	520	}
521	521
522	522	if tmpLimit := r.Form.Get("limit"); tmpLimit != "" {
523		- config.Limit, err = strconv.Atoi(tmpLimit)
	523	+ limit, err := strconv.Atoi(tmpLimit)
524	524	if err != nil {
525	525	return err
526	526	}
	527	+ config.Limit = limit
527	528	}
528	529
529	530	containers, err := getDaemon(eng).Containers(config)

Use local variable err instead of a outer one