global: apply gofumpt

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

5 files changed, 29 insertions, 13 deletions

diff --git a/manager/ipc_client.go b/manager/ipc_client.go
index 2f78a47e..199156bc 100644
--- a/manager/ipc_client.go
+++ b/manager/ipc_client.go
@@ -64,7 +64,7 @@ var (
 )
 
 type TunnelChangeCallback struct {
-	cb func(tunnel *Tunnel, state TunnelState, globalState TunnelState, err error)
+	cb func(tunnel *Tunnel, state, globalState TunnelState, err error)
 }
 
 var tunnelChangeCallbacks = make(map[*TunnelChangeCallback]bool)
@@ -93,7 +93,7 @@ type UpdateProgressCallback struct {
 
 var updateProgressCallbacks = make(map[*UpdateProgressCallback]bool)
 
-func InitializeIPCClient(reader *os.File, writer *os.File, events *os.File) {
+func InitializeIPCClient(reader, writer, events *os.File) {
 	rpcDecoder = gob.NewDecoder(reader)
 	rpcEncoder = gob.NewEncoder(writer)
 	go func() {
@@ -431,43 +431,52 @@ func IPCClientUpdate() error {
 	return rpcEncoder.Encode(UpdateMethodType)
 }
 
-func IPCClientRegisterTunnelChange(cb func(tunnel *Tunnel, state TunnelState, globalState TunnelState, err error)) *TunnelChangeCallback {
+func IPCClientRegisterTunnelChange(cb func(tunnel *Tunnel, state, globalState TunnelState, err error)) *TunnelChangeCallback {
 	s := &TunnelChangeCallback{cb}
 	tunnelChangeCallbacks[s] = true
 	return s
 }
+
 func (cb *TunnelChangeCallback) Unregister() {
 	delete(tunnelChangeCallbacks, cb)
 }
+
 func IPCClientRegisterTunnelsChange(cb func()) *TunnelsChangeCallback {
 	s := &TunnelsChangeCallback{cb}
 	tunnelsChangeCallbacks[s] = true
 	return s
 }
+
 func (cb *TunnelsChangeCallback) Unregister() {
 	delete(tunnelsChangeCallbacks, cb)
 }
+
 func IPCClientRegisterManagerStopping(cb func()) *ManagerStoppingCallback {
 	s := &ManagerStoppingCallback{cb}
 	managerStoppingCallbacks[s] = true
 	return s
 }
+
 func (cb *ManagerStoppingCallback) Unregister() {
 	delete(managerStoppingCallbacks, cb)
 }
+
 func IPCClientRegisterUpdateFound(cb func(updateState UpdateState)) *UpdateFoundCallback {
 	s := &UpdateFoundCallback{cb}
 	updateFoundCallbacks[s] = true
 	return s
 }
+
 func (cb *UpdateFoundCallback) Unregister() {
 	delete(updateFoundCallbacks, cb)
 }
+
 func IPCClientRegisterUpdateProgress(cb func(dp updater.DownloadProgress)) *UpdateProgressCallback {
 	s := &UpdateProgressCallback{cb}
 	updateProgressCallbacks[s] = true
 	return s
 }
+
 func (cb *UpdateProgressCallback) Unregister() {
 	delete(updateProgressCallbacks, cb)
 }
diff --git a/manager/ipc_driver.go b/manager/ipc_driver.go
index 2155207b..a4f83e61 100644
--- a/manager/ipc_driver.go
+++ b/manager/ipc_driver.go
@@ -16,8 +16,10 @@ type lockedDriverAdapter struct {
 	sync.Mutex
 }
 
-var driverAdapters = make(map[string]*lockedDriverAdapter)
-var driverAdaptersLock sync.RWMutex
+var (
+	driverAdapters     = make(map[string]*lockedDriverAdapter)
+	driverAdaptersLock sync.RWMutex
+)
 
 func findDriverAdapter(tunnelName string) (*lockedDriverAdapter, error) {
 	driverAdaptersLock.RLock()
diff --git a/manager/ipc_server.go b/manager/ipc_server.go
index dccbce28..bb36c649 100644
--- a/manager/ipc_server.go
+++ b/manager/ipc_server.go
@@ -23,10 +23,12 @@ import (
 	"golang.zx2c4.com/wireguard/windows/updater"
 )
 
-var managerServices = make(map[*ManagerService]bool)
-var managerServicesLock sync.RWMutex
-var haveQuit uint32
-var quitManagersChan = make(chan struct{}, 1)
+var (
+	managerServices     = make(map[*ManagerService]bool)
+	managerServicesLock sync.RWMutex
+	haveQuit            uint32
+	quitManagersChan    = make(chan struct{}, 1)
+)
 
 type ManagerService struct {
 	events        *os.File
@@ -439,7 +441,7 @@ func (s *ManagerService) ServeConn(reader io.Reader, writer io.Writer) {
 	}
 }
 
-func IPCServerListen(reader *os.File, writer *os.File, events *os.File, elevatedToken windows.Token) {
+func IPCServerListen(reader, writer, events *os.File, elevatedToken windows.Token) {
 	service := &ManagerService{
 		events:        events,
 		elevatedToken: elevatedToken,
diff --git a/manager/service.go b/manager/service.go
index d5c50156..5e243969 100644
--- a/manager/service.go
+++ b/manager/service.go
@@ -207,7 +207,8 @@ func (service *managerService) Execute(args []string, r <-chan svc.ChangeRequest
 					windows.Handle(theirReader.Fd()),
 					windows.Handle(theirWriter.Fd()),
 					windows.Handle(theirEvents.Fd()),
-					theirLogMapping}, runToken)
+					theirLogMapping,
+				}, runToken)
 			} else {
 				err = errors.New("Session has logged out")
 			}
diff --git a/manager/tunneltracker.go b/manager/tunneltracker.go
index 96020635..4a6fb5bb 100644
--- a/manager/tunneltracker.go
+++ b/manager/tunneltracker.go
@@ -24,8 +24,10 @@ import (
 	"golang.zx2c4.com/wireguard/windows/services"
 )
 
-var trackedTunnels = make(map[string]TunnelState)
-var trackedTunnelsLock = sync.Mutex{}
+var (
+	trackedTunnels     = make(map[string]TunnelState)
+	trackedTunnelsLock = sync.Mutex{}
+)
 
 func trackedTunnelsGlobalState() (state TunnelState) {
 	state = TunnelStopped