Removed extraneous comments and defaults plus amended variable declar…

…ation Signed-off-by: Steve Taylor <[email protected]>
containers · Mar 6, 2020 · 06f5664 · 06f5664
1 parent 920d09c
commit 06f5664
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/pkg/api/handlers/generic/images.go b/pkg/api/handlers/generic/images.go
@@ -305,7 +305,6 @@ func GetImages(w http.ResponseWriter, r *http.Request) {
 		utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "Failed get images"))
 		return
 	}
-	// +1 removed from len(images) as this leaves a null entry at the end of the image array
 	var summaries = make([]*handlers.ImageSummary, len(images))
 	for j, img := range images {
 		is, err := handlers.ImageToImageSummary(img)

diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go
@@ -355,13 +355,12 @@ func LibpodToContainer(l *libpod.Container, infoData []define.InfoData, sz bool)
 		sizeRootFs int64
 		sizeRW     int64
 		state      define.ContainerStatus
-		stateStr   string
 	)
 
 	if state, err = l.State(); err != nil {
 		return nil, err
 	}
-	stateStr = state.String()
+	stateStr := state.String()
 	if stateStr == "configured" {
 		stateStr = "created"
 	}
@@ -373,9 +372,6 @@ func LibpodToContainer(l *libpod.Container, infoData []define.InfoData, sz bool)
 		if sizeRootFs, err = l.RootFsSize(); err != nil {
 			return nil, err
 		}
-	} else {
-		sizeRW = 0
-		sizeRootFs = 0
 	}
 
 	return &Container{docker.Container{