Merge branch 'main' into pinglanlu/main

Author: Zheaoli

cmd/nerdctl/container/container_diff.go

@@ -197,8 +197,8 @@ func getChanges(ctx context.Context, client *containerd.Client, container contai
 	return changes, err
 }
 
-func appendChanges(changes []fs.Change, new fs.Change) []fs.Change {
-	newDir, _ := filepath.Split(new.Path)
+func appendChanges(changes []fs.Change, fsChange fs.Change) []fs.Change {
+	newDir, _ := filepath.Split(fsChange.Path)
 	newDirPath := filepath.SplitList(newDir)
 
 	if len(changes) == 0 {
@@ -208,7 +208,7 @@ func appendChanges(changes []fs.Change, new fs.Change) []fs.Change {
 				Path: filepath.Join(newDirPath[:i+1]...),
 			})
 		}
-		return append(changes, new)
+		return append(changes, fsChange)
 	}
 	last := changes[len(changes)-1]
 	lastDir, _ := filepath.Split(last.Path)
@@ -222,7 +222,7 @@ func appendChanges(changes []fs.Change, new fs.Change) []fs.Change {
 			Path: filepath.Join(newDirPath[:i+1]...),
 		})
 	}
-	return append(changes, new)
+	return append(changes, fsChange)
 }
 
 func diffShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {

pkg/imgutil/filtering.go

@@ -302,12 +302,12 @@ func filter[T any](items []T, f func(item T) (bool, error)) ([]T, error) {
 	return filteredItems, nil
 }
 
-func imageCreatedBetween(image images.Image, min time.Time, max time.Time) bool {
-	return image.CreatedAt.After(min) && image.CreatedAt.Before(max)
+func imageCreatedBetween(image images.Image, minTime time.Time, maxTime time.Time) bool {
+	return image.CreatedAt.After(minTime) && image.CreatedAt.Before(maxTime)
 }
 
-func imageCreatedBefore(image images.Image, max time.Time) bool {
-	return image.CreatedAt.Before(max)
+func imageCreatedBefore(image images.Image, maxTime time.Time) bool {
+	return image.CreatedAt.Before(maxTime)
 }
 
 func matchesAllLabels(imageCfgLabels map[string]string, filterLabels map[string]string) bool {