From 3fef806e674f913b712e834269f20be1e678677b Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 14 May 2019 09:09:01 +0200 Subject: global: regroup all imports --- conf/dnsresolver_windows.go | 3 ++- conf/dpapi/dpapi_windows.go | 3 ++- conf/dpapi/dpapi_windows_test.go | 3 ++- conf/path_windows.go | 3 ++- conf/store.go | 3 ++- conf/storewatcher_windows.go | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) (limited to 'conf') diff --git a/conf/dnsresolver_windows.go b/conf/dnsresolver_windows.go index 65ae383f..165baf3e 100644 --- a/conf/dnsresolver_windows.go +++ b/conf/dnsresolver_windows.go @@ -7,12 +7,13 @@ package conf import ( "fmt" - "golang.org/x/sys/windows" "log" "net" "syscall" "time" "unsafe" + + "golang.org/x/sys/windows" ) //sys internetGetConnectedState(flags *uint32, reserved uint32) (connected bool) = wininet.InternetGetConnectedState diff --git a/conf/dpapi/dpapi_windows.go b/conf/dpapi/dpapi_windows.go index 03a5d8a3..05074717 100644 --- a/conf/dpapi/dpapi_windows.go +++ b/conf/dpapi/dpapi_windows.go @@ -7,9 +7,10 @@ package dpapi import ( "errors" - "golang.org/x/sys/windows" "runtime" "unsafe" + + "golang.org/x/sys/windows" ) const ( diff --git a/conf/dpapi/dpapi_windows_test.go b/conf/dpapi/dpapi_windows_test.go index e0e9b42d..8356f2d4 100644 --- a/conf/dpapi/dpapi_windows_test.go +++ b/conf/dpapi/dpapi_windows_test.go @@ -7,9 +7,10 @@ package dpapi import ( "bytes" - "golang.org/x/sys/windows" "testing" "unsafe" + + "golang.org/x/sys/windows" ) func TestRoundTrip(t *testing.T) { diff --git a/conf/path_windows.go b/conf/path_windows.go index 8b23e399..1345db14 100644 --- a/conf/path_windows.go +++ b/conf/path_windows.go @@ -7,10 +7,11 @@ package conf import ( "errors" - "golang.org/x/sys/windows" "os" "path/filepath" "unsafe" + + "golang.org/x/sys/windows" ) //sys coTaskMemFree(pointer uintptr) = ole32.CoTaskMemFree diff --git a/conf/store.go b/conf/store.go index 43f524cd..9c645a6b 100644 --- a/conf/store.go +++ b/conf/store.go @@ -7,11 +7,12 @@ package conf import ( "errors" - "golang.zx2c4.com/wireguard/windows/conf/dpapi" "io/ioutil" "os" "path/filepath" "strings" + + "golang.zx2c4.com/wireguard/windows/conf/dpapi" ) const configFileSuffix = ".conf.dpapi" diff --git a/conf/storewatcher_windows.go b/conf/storewatcher_windows.go index 5c5ffac7..26e94cd2 100644 --- a/conf/storewatcher_windows.go +++ b/conf/storewatcher_windows.go @@ -6,8 +6,9 @@ package conf import ( - "golang.org/x/sys/windows" "log" + + "golang.org/x/sys/windows" ) const ( -- cgit v1.2.3-59-g8ed1b