github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9017 from Juneezee/refactor/redundant-nil-check

Browse Source 
Remove redundant nil check
This commit is contained in:
Derek McGowan 2023-08-28 06:55:10 -07:00 committed by GitHub
commit 2a806c710a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container.go
View File

@ -275,7 +275,6 @@ func (c *container) NewTask(ctx context.Context, ioCreate cio.Creator, opts ...N
return nil, err return nil, err
} }
} }
if info.RootFS != nil {
for _, m := range info.RootFS { for _, m := range info.RootFS {
request.Rootfs = append(request.Rootfs, &types.Mount{ request.Rootfs = append(request.Rootfs, &types.Mount{
Type: m.Type, Type: m.Type,
@ -284,7 +283,6 @@ func (c *container) NewTask(ctx context.Context, ioCreate cio.Creator, opts ...N
Options: m.Options, Options: m.Options,
}) })
} }
}
request.RuntimePath = info.RuntimePath request.RuntimePath = info.RuntimePath
if info.Options != nil { if info.Options != nil {
o, err := typeurl.MarshalAny(info.Options) o, err := typeurl.MarshalAny(info.Options)

2
remotes/docker/config/hosts.go
View File

@ -193,7 +193,6 @@ func ConfigureHosts(ctx context.Context, options HostOptions) docker.RegistryHos
} }
} }
if host.clientPairs != nil {
for _, pair := range host.clientPairs { for _, pair := range host.clientPairs {
certPEMBlock, err := os.ReadFile(pair[0]) certPEMBlock, err := os.ReadFile(pair[0])
if err != nil { if err != nil {
@ -216,7 +215,6 @@ func ConfigureHosts(ctx context.Context, options HostOptions) docker.RegistryHos
tlsConfig.Certificates = append(tlsConfig.Certificates, cert) tlsConfig.Certificates = append(tlsConfig.Certificates, cert)
} }
}
c := *client c := *client
c.Transport = tr c.Transport = tr