diff options
author | Sebastiaan van Stijn <github@gone.nl> | 2019-11-25 13:35:00 +0100 |
---|---|---|
committer | Sebastiaan van Stijn <github@gone.nl> | 2019-11-25 13:35:00 +0100 |
commit | 33d8492ce413780e4e339631386541410677ecf3 (patch) | |
tree | d16f41c942d8c1d3820b14db33c8221acf019703 | |
parent | 4cdb796b5453d4c2fe7dde85cadd2a56725e3452 (diff) | |
download | docker-33d8492ce413780e4e339631386541410677ecf3.tar.gz |
pkg/system/windows: remove unnecessary conversions
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
-rw-r--r-- | pkg/system/syscall_windows.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/system/syscall_windows.go b/pkg/system/syscall_windows.go index d0f32ed05d..2c8017db56 100644 --- a/pkg/system/syscall_windows.go +++ b/pkg/system/syscall_windows.go @@ -99,7 +99,7 @@ func IsWindowsClient() bool { // Unmount is a platform-specific helper function to call // the unmount syscall. Not supported on Windows -func Unmount(dest string) error { +func Unmount(_ string) error { return nil } @@ -120,7 +120,7 @@ func CommandLineToArgv(commandLine string) ([]string, error) { newArgs := make([]string, argc) for i, v := range (*argv)[:argc] { - newArgs[i] = string(windows.UTF16ToString((*v)[:])) + newArgs[i] = windows.UTF16ToString((*v)[:]) } return newArgs, nil @@ -147,7 +147,7 @@ func GetSecurityDescriptorDacl(securityDescriptor *byte, daclPresent *uint32, da r1, _, e1 := syscall.Syscall6(procGetSecurityDescriptorDacl.Addr(), 4, uintptr(unsafe.Pointer(securityDescriptor)), uintptr(unsafe.Pointer(daclPresent)), uintptr(unsafe.Pointer(dacl)), uintptr(unsafe.Pointer(daclDefaulted)), 0, 0) if r1 == 0 { if e1 != 0 { - result = syscall.Errno(e1) + result = e1 } else { result = syscall.EINVAL } |