daemon/containerd: newROLayerForImage: remove unused args

thaJeztah · thaJeztah · commit aefbd4903880 · 2023-08-29T12:54:19.000+02:00
Also rename variables that collided with imports.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/daemon/containerd/image_builder.go b/daemon/containerd/image_builder.go
@@ -76,12 +76,12 @@ func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID s
 				return nil, nil, system.ErrNotSupportedOperatingSystem
 			}
 
-			layer, err := newROLayerForImage(ctx, &imgDesc, i, opts, refOrID, opts.Platform)
+			roLayer, err := newROLayerForImage(ctx, &imgDesc, i, opts.Platform)
 			if err != nil {
 				return nil, nil, err
 			}
 
-			return img, layer, nil
+			return img, roLayer, nil
 		}
 	}
 
@@ -105,12 +105,12 @@ func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID s
 		return nil, nil, err
 	}
 
-	layer, err := newROLayerForImage(ctx, imgDesc, i, opts, refOrID, opts.Platform)
+	roLayer, err := newROLayerForImage(ctx, imgDesc, i, opts.Platform)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	return img, layer, nil
+	return img, roLayer, nil
 }
 
 func (i *ImageService) pullForBuilder(ctx context.Context, name string, authConfigs map[string]registry.AuthConfig, output io.Writer, platform *ocispec.Platform) (*ocispec.Descriptor, error) {
@@ -173,7 +173,7 @@ Please notify the image author to correct the configuration.`,
 	return &imgDesc, err
 }
 
-func newROLayerForImage(ctx context.Context, imgDesc *ocispec.Descriptor, i *ImageService, opts backend.GetImageAndLayerOptions, refOrID string, platform *ocispec.Platform) (builder.ROLayer, error) {
+func newROLayerForImage(ctx context.Context, imgDesc *ocispec.Descriptor, i *ImageService, platform *ocispec.Platform) (builder.ROLayer, error) {
 	if imgDesc == nil {
 		return nil, fmt.Errorf("can't make an RO layer for a nil image :'(")
 	}

Original file line number	Diff line number	Diff line change
`@@ -76,12 +76,12 @@ func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID s`
`76`	`76`	`return nil, nil, system.ErrNotSupportedOperatingSystem`
`77`	`77`	`}`
`78`	`78`
`79`		`- layer, err := newROLayerForImage(ctx, &imgDesc, i, opts, refOrID, opts.Platform)`
	`79`	`+ roLayer, err := newROLayerForImage(ctx, &imgDesc, i, opts.Platform)`
`80`	`80`	`if err != nil {`
`81`	`81`	`return nil, nil, err`
`82`	`82`	`}`
`83`	`83`
`84`		`- return img, layer, nil`
	`84`	`+ return img, roLayer, nil`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`@@ -105,12 +105,12 @@ func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID s`
`105`	`105`	`return nil, nil, err`
`106`	`106`	`}`
`107`	`107`
`108`		`- layer, err := newROLayerForImage(ctx, imgDesc, i, opts, refOrID, opts.Platform)`
	`108`	`+ roLayer, err := newROLayerForImage(ctx, imgDesc, i, opts.Platform)`
`109`	`109`	`if err != nil {`
`110`	`110`	`return nil, nil, err`
`111`	`111`	`}`
`112`	`112`
`113`		`- return img, layer, nil`
	`113`	`+ return img, roLayer, nil`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`func (i ImageService) pullForBuilder(ctx context.Context, name string, authConfigs map[string]registry.AuthConfig, output io.Writer, platform ocispec.Platform) (*ocispec.Descriptor, error) {`
@@ -173,7 +173,7 @@ Please notify the image author to correct the configuration.`,
`173`	`173`	`return &imgDesc, err`
`174`	`174`	`}`
`175`	`175`
`176`		`-func newROLayerForImage(ctx context.Context, imgDesc ocispec.Descriptor, i ImageService, opts backend.GetImageAndLayerOptions, refOrID string, platform *ocispec.Platform) (builder.ROLayer, error) {`
	`176`	`+func newROLayerForImage(ctx context.Context, imgDesc ocispec.Descriptor, i ImageService, platform *ocispec.Platform) (builder.ROLayer, error) {`
`177`	`177`	`if imgDesc == nil {`
`178`	`178`	`return nil, fmt.Errorf("can't make an RO layer for a nil image :'(")`
`179`	`179`	`}`