From 9637be0e9d539b4b379ae3dd31b60f17b6bbf4e5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 Mar 2021 12:14:47 +0100 Subject: [PATCH 1/2] libcontainerd: remove unused win32 errors (leftover from TP4) These were added in 94d70d835500bec3b171425271916d3e40f29635 for Windows TP4, but no longer used after 331c8a86d489e573fcbf1df3c4f813bbc3168624 removed support for TP4. Signed-off-by: Sebastiaan van Stijn --- libcontainerd/local/local_windows.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/libcontainerd/local/local_windows.go b/libcontainerd/local/local_windows.go index 85e1d8c772..cec66cb239 100644 --- a/libcontainerd/local/local_windows.go +++ b/libcontainerd/local/local_windows.go @@ -61,16 +61,6 @@ type container struct { terminateInvoked bool } -// Win32 error codes that are used for various workarounds -// These really should be ALL_CAPS to match golangs syscall library and standard -// Win32 error conventions, but golint insists on CamelCase. -const ( - CoEClassstring = syscall.Errno(0x800401F3) // Invalid class string - ErrorNoNetwork = syscall.Errno(1222) // The network is not present or not started - ErrorBadPathname = syscall.Errno(161) // The specified path is invalid - ErrorInvalidObject = syscall.Errno(0x800710D8) // The object identifier does not represent a valid object -) - // defaultOwner is a tag passed to HCS to allow it to differentiate between // container creator management stacks. We hard code "docker" in the case // of docker. From 0f32beb4f8d0a1db1ecc945f9669a35fd463af2c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 Mar 2021 21:51:47 +0100 Subject: [PATCH 2/2] libcontainerd: remove unused consts Signed-off-by: Sebastiaan van Stijn --- libcontainerd/remote/client_windows.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libcontainerd/remote/client_windows.go b/libcontainerd/remote/client_windows.go index c371b9a8b4..1d1f25925a 100644 --- a/libcontainerd/remote/client_windows.go +++ b/libcontainerd/remote/client_windows.go @@ -16,11 +16,6 @@ import ( "github.com/sirupsen/logrus" ) -const ( - runtimeName = "io.containerd.runhcs.v1" - shimV2RuntimeName = runtimeName -) - func summaryFromInterface(i interface{}) (*libcontainerdtypes.Summary, error) { switch pd := i.(type) { case *options.ProcessDetails: