Apply formatting from gofumpt

Author: tech10

nvdaRemoteServer.go

@@ -2,10 +2,11 @@ package main
 
 import (
 	"fmt"
-	. "github.com/tech10/nvdaRemoteServer/server"
 	"os"
 	"strings"
 	"sync"
+
+	. "github.com/tech10/nvdaRemoteServer/server"
 )
 
 var Version string = "development"

server/cfg.go

@@ -2,9 +2,10 @@ package server
 
 import (
 	"errors"
-	"github.com/tech10/panic_handler"
 	"os"
 	"path/filepath"
+
+	"github.com/tech10/panic_handler"
 )
 
 type Cfg struct {

server/commands.go

@@ -104,5 +104,4 @@ func init() {
 		time.Sleep(time.Second)
 		c.Close()
 	})
-
 }

server/configure.go

@@ -10,8 +10,10 @@ import (
 
 var confFile string
 
-var genConfFile string
-var genConfDir bool
+var (
+	genConfFile string
+	genConfDir  bool
+)
 
 var confRead bool
 
@@ -39,9 +41,11 @@ var Launch bool
 
 var Servers []*Server
 
-var PID int
-var PID_STR string
-var pidfile string
+var (
+	PID     int
+	PID_STR string
+	pidfile string
+)
 
 func Configure() error {
 	PID = os.Getpid()

server/connection.go

@@ -31,10 +31,12 @@ type Server struct {
 	Stop              context.CancelFunc
 }
 
-var mctx context.Context
-var StopServers context.CancelFunc
-var msl sync.Mutex
-var stoppingServers bool = false
+var (
+	mctx            context.Context
+	StopServers     context.CancelFunc
+	msl             sync.Mutex
+	stoppingServers bool = false
+)
 
 func init() {
 	mctx, StopServers = context.WithCancel(context.Background())

server/defaults.go

@@ -6,34 +6,44 @@ import (
 
 var PS string = string(os.PathSeparator)
 
-var DEFAULT_CONF_FILE string = ""
-var DEFAULT_CONF_NAME string = "nvdaRemoteServer.json"
-var DEFAULT_CONF_DIR string
+var (
+	DEFAULT_CONF_FILE string = ""
+	DEFAULT_CONF_NAME string = "nvdaRemoteServer.json"
+	DEFAULT_CONF_DIR  string
+)
 
 var DEFAULT_CONF_READ bool = true
 
-var DEFAULT_GEN_CONF_FILE string = ""
-var DEFAULT_GEN_CONF_DIR bool = false
+var (
+	DEFAULT_GEN_CONF_FILE string = ""
+	DEFAULT_GEN_CONF_DIR  bool   = false
+)
 
 var DEFAULT_ADDRESS string = ":6837"
 
-var DEFAULT_CERT_FILE string = ""
-var DEFAULT_KEY_FILE string = ""
-var DEFAULT_GEN_CERT_FILE string = ""
+var (
+	DEFAULT_CERT_FILE     string = ""
+	DEFAULT_KEY_FILE      string = ""
+	DEFAULT_GEN_CERT_FILE string = ""
+)
 
 var DEFAULT_LOG_FILE string = ""
 
 var DEFAULT_LOG_LEVEL int = 0
 
-const LOG_SILENT int = -1
-const LOG_INFO int = 0
-const LOG_CONNECTION int = 1
-const LOG_CHANNEL int = 2
-const LOG_DEBUG int = 3
-const LOG_PROTOCOL int = 4
+const (
+	LOG_SILENT     int = -1
+	LOG_INFO       int = 0
+	LOG_CONNECTION int = 1
+	LOG_CHANNEL    int = 2
+	LOG_DEBUG      int = 3
+	LOG_PROTOCOL   int = 4
+)
 
-var DEFAULT_MOTD string = ""
-var DEFAULT_MOTD_ALWAYS_DISPLAY bool = false
+var (
+	DEFAULT_MOTD                string = ""
+	DEFAULT_MOTD_ALWAYS_DISPLAY bool   = false
+)
 
 var DEFAULT_SEND_ORIGIN bool = true
 

server/file.go

@@ -14,7 +14,7 @@ func file_rewrite(file string, data []byte) error {
 	if ferr != nil {
 		return errors.New("Unable to create or open the file " + file + "\n" + ferr.Error())
 	}
-	w, err := os.OpenFile(file, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+	w, err := os.OpenFile(file, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o644)
 	if err != nil {
 		return errors.New("Unable to create or open the file " + file + "\n" + err.Error())
 	}
@@ -80,7 +80,7 @@ func cdir(dir string) error {
 	if !createDir {
 		return nil
 	}
-	err := os.MkdirAll(dir, 0755)
+	err := os.MkdirAll(dir, 0o755)
 	if err == nil {
 		return nil
 	}

server/genCert.go

@@ -23,7 +23,7 @@ func serial_number() *big.Int {
 }
 
 func gen_cert() (*tls.Config, error) {
-	var ca = &x509.Certificate{
+	ca := &x509.Certificate{
 		SerialNumber: serial_number(),
 		Subject: pkix.Name{
 			Country:      []string{"US"},

server/logger.go

@@ -9,9 +9,11 @@ import (
 
 var ll sync.Mutex
 
-var log_standard *log.Logger
-var log_error *log.Logger
-var log_file *os.File
+var (
+	log_standard *log.Logger
+	log_error    *log.Logger
+	log_file     *os.File
+)
 
 func Log(level int, msg ...interface{}) {
 	if level > loglevel {
@@ -40,7 +42,7 @@ func log_init(file string) {
 		Log(LOG_INFO, "The log file at "+file+" will not be written, as the server has been told not to launch.")
 		return
 	}
-	w, err := os.OpenFile(file, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
+	w, err := os.OpenFile(file, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0o644)
 	if err != nil {
 		log_init("")
 		Log_error("Unable to open log file " + file + " for writing.\r\n" + err.Error())

server/server.go

@@ -6,11 +6,13 @@ import (
 	"sync"
 )
 
-var sl sync.Mutex
-var EndMessage byte = '\n'
-var lastID int = 0
-var clients map[*Client]struct{}
-var channels map[string]*ClientChannel
+var (
+	sl         sync.Mutex
+	EndMessage byte = '\n'
+	lastID     int  = 0
+	clients    map[*Client]struct{}
+	channels   map[string]*ClientChannel
+)
 
 func AddClient(c *Client) {
 	sl.Lock()

server/shutdown.go

@@ -1,8 +1,9 @@
 package server
 
 import (
-	"github.com/tech10/panic_handler"
 	"os"
+
+	"github.com/tech10/panic_handler"
 )
 
 func Shutdown() {

signals/signals.go

@@ -10,7 +10,7 @@ import (
 )
 
 func Wait() chan os.Signal {
-	//Signal notifiers
+	// Signal notifiers
 	kill := make(chan os.Signal, 1)
 	signal.Notify(kill,
 		os.Interrupt,

signals/signals_plan9.go

@@ -10,7 +10,7 @@ import (
 )
 
 func Wait() chan os.Signal {
-	//Signal notifiers
+	// Signal notifiers
 	kill := make(chan os.Signal, 1)
 	signal.Notify(kill,
 		os.Interrupt,