Remove underscores from Go code, pt 1

7 files changed, 29 insertions, 31 deletions

diff --git a/config.go b/config.go
index 8ed0d01..2f89ba7 100644
--- a/config.go
+++ b/config.go
@@ -15,8 +15,6 @@ import (
 
 var database *pgxpool.Pool
 
-var err_unsupported_database_type = errors.New("unsupported database type")
-
 var config struct {
 	HTTP struct {
 		Net          string `scfg:"net"`
@@ -46,22 +44,22 @@ var config struct {
 	} `scfg:"db"`
 }
 
-func load_config(path string) (err error) {
-	var config_file *os.File
+func loadConfig(path string) (err error) {
+	var configFile *os.File
 	var decoder *scfg.Decoder
 
-	if config_file, err = os.Open(path); err != nil {
+	if configFile, err = os.Open(path); err != nil {
 		return err
 	}
-	defer config_file.Close()
+	defer configFile.Close()
 
-	decoder = scfg.NewDecoder(bufio.NewReader(config_file))
+	decoder = scfg.NewDecoder(bufio.NewReader(configFile))
 	if err = decoder.Decode(&config); err != nil {
 		return err
 	}
 
 	if config.DB.Type != "postgres" {
-		return err_unsupported_database_type
+		return errors.New("unsupported database type")
 	}
 
 	if database, err = pgxpool.New(context.Background(), config.DB.Conn); err != nil {
diff --git a/git_hooks_deploy.go b/git_hooks_deploy.go
index 9965b43..d95d6a5 100644
--- a/git_hooks_deploy.go
+++ b/git_hooks_deploy.go
@@ -10,10 +10,10 @@ import (
 	"path/filepath"
 )
 
-// deploy_hooks_to_filesystem deploys the git hooks client to the filesystem.
+// deployHooks deploys the git hooks client to the filesystem.
 // The git hooks client is expected to be embedded in resources_fs and must be
 // pre-compiled during the build process; see the Makefile.
-func deploy_hooks_to_filesystem() (err error) {
+func deployHooks() (err error) {
 	err = func() (err error) {
 		var src_fd fs.File
 		var dst_fd *os.File
diff --git a/git_hooks_handle.go b/git_hooks_handle.go
index 178b3c7..e23b7ce 100644
--- a/git_hooks_handle.go
+++ b/git_hooks_handle.go
@@ -319,7 +319,7 @@ func hooks_handle_connection(conn net.Conn) {
 	_, _ = conn.Write([]byte{hook_return_value})
 }
 
-func serve_git_hooks(listener net.Listener) error {
+func serveGitHooks(listener net.Listener) error {
 	for {
 		conn, err := listener.Accept()
 		if err != nil {
diff --git a/http_server.go b/http_server.go
index f2238d8..9548a65 100644
--- a/http_server.go
+++ b/http_server.go
@@ -14,9 +14,9 @@ import (
 	"go.lindenii.runxiyu.org/lindenii-common/clog"
 )
 
-type http_router_t struct{}
+type httpRouter struct{}
 
-func (router *http_router_t) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (router *httpRouter) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	clog.Info("Incoming HTTP: " + r.RemoteAddr + " " + r.Method + " " + r.RequestURI)
 
 	var segments []string
diff --git a/main.go b/main.go
index 5e836f1..a1a5223 100644
--- a/main.go
+++ b/main.go
@@ -15,33 +15,33 @@ import (
 )
 
 func main() {
-	config_path := flag.String(
+	configPath := flag.String(
 		"config",
 		"/etc/lindenii/forge.scfg",
 		"path to configuration file",
 	)
 	flag.Parse()
 
-	if err := load_config(*config_path); err != nil {
+	if err := loadConfig(*configPath); err != nil {
 		clog.Fatal(1, "Loading configuration: "+err.Error())
 	}
-	if err := deploy_hooks_to_filesystem(); err != nil {
+	if err := deployHooks(); err != nil {
 		clog.Fatal(1, "Deploying hooks to filesystem: "+err.Error())
 	}
-	if err := load_templates(); err != nil {
+	if err := loadTemplates(); err != nil {
 		clog.Fatal(1, "Loading templates: "+err.Error())
 	}
 
 	// UNIX socket listener for hooks
-	var hooks_listener net.Listener
+	var hooksListener net.Listener
 	var err error
-	hooks_listener, err = net.Listen("unix", config.Hooks.Socket)
+	hooksListener, err = net.Listen("unix", config.Hooks.Socket)
 	if errors.Is(err, syscall.EADDRINUSE) {
 		clog.Warn("Removing stale socket " + config.Hooks.Socket)
 		if err = syscall.Unlink(config.Hooks.Socket); err != nil {
 			clog.Fatal(1, "Removing stale socket: "+err.Error())
 		}
-		if hooks_listener, err = net.Listen("unix", config.Hooks.Socket); err != nil {
+		if hooksListener, err = net.Listen("unix", config.Hooks.Socket); err != nil {
 			clog.Fatal(1, "Listening hooks: "+err.Error())
 		}
 	} else if err != nil {
@@ -49,19 +49,19 @@ func main() {
 	}
 	clog.Info("Listening hooks on unix " + config.Hooks.Socket)
 	go func() {
-		if err = serve_git_hooks(hooks_listener); err != nil {
+		if err = serveGitHooks(hooksListener); err != nil {
 			clog.Fatal(1, "Serving hooks: "+err.Error())
 		}
 	}()
 
 	// SSH listener
-	ssh_listener, err := net.Listen(config.SSH.Net, config.SSH.Addr)
+	sshListener, err := net.Listen(config.SSH.Net, config.SSH.Addr)
 	if errors.Is(err, syscall.EADDRINUSE) && config.SSH.Net == "unix" {
 		clog.Warn("Removing stale socket " + config.SSH.Addr)
 		if err = syscall.Unlink(config.SSH.Addr); err != nil {
 			clog.Fatal(1, "Removing stale socket: "+err.Error())
 		}
-		if ssh_listener, err = net.Listen(config.SSH.Net, config.SSH.Addr); err != nil {
+		if sshListener, err = net.Listen(config.SSH.Net, config.SSH.Addr); err != nil {
 			clog.Fatal(1, "Listening SSH: "+err.Error())
 		}
 	} else if err != nil {
@@ -69,19 +69,19 @@ func main() {
 	}
 	clog.Info("Listening SSH on " + config.SSH.Net + " " + config.SSH.Addr)
 	go func() {
-		if err = serve_ssh(ssh_listener); err != nil {
+		if err = serveSSH(sshListener); err != nil {
 			clog.Fatal(1, "Serving SSH: "+err.Error())
 		}
 	}()
 
 	// HTTP listener
-	http_listener, err := net.Listen(config.HTTP.Net, config.HTTP.Addr)
+	httpListener, err := net.Listen(config.HTTP.Net, config.HTTP.Addr)
 	if errors.Is(err, syscall.EADDRINUSE) && config.HTTP.Net == "unix" {
 		clog.Warn("Removing stale socket " + config.HTTP.Addr)
 		if err = syscall.Unlink(config.HTTP.Addr); err != nil {
 			clog.Fatal(1, "Removing stale socket: "+err.Error())
 		}
-		if http_listener, err = net.Listen(config.HTTP.Net, config.HTTP.Addr); err != nil {
+		if httpListener, err = net.Listen(config.HTTP.Net, config.HTTP.Addr); err != nil {
 			clog.Fatal(1, "Listening HTTP: "+err.Error())
 		}
 	} else if err != nil {
@@ -89,19 +89,19 @@ func main() {
 	}
 	clog.Info("Listening HTTP on " + config.HTTP.Net + " " + config.HTTP.Addr)
 	go func() {
-		if err = http.Serve(http_listener, &http_router_t{}); err != nil {
+		if err = http.Serve(httpListener, &httpRouter{}); err != nil {
 			clog.Fatal(1, "Serving HTTP: "+err.Error())
 		}
 	}()
 
 	// Pprof listener
-	pprof_listener, err := net.Listen("tcp", "localhost:6060")
+	pprofListener, err := net.Listen("tcp", "localhost:6060")
 	if err != nil {
 		clog.Fatal(1, "Listening pprof: "+err.Error())
 	}
 	clog.Info("Listening pprof on tcp localhost:6060")
 	go func() {
-		if err = http.Serve(pprof_listener, nil); err != nil {
+		if err = http.Serve(pprofListener, nil); err != nil {
 			clog.Fatal(1, "Serving pprof: "+err.Error())
 		}
 	}()
diff --git a/resources.go b/resources.go
index 41d15d7..1a2b706 100644
--- a/resources.go
+++ b/resources.go
@@ -35,7 +35,7 @@ var resources_fs embed.FS
 
 var templates *template.Template
 
-func load_templates() (err error) {
+func loadTemplates() (err error) {
 	m := minify.New()
 	m.Add("text/html", &html.Minifier{TemplateDelims: [2]string{"{{", "}}"}, KeepDefaultAttrVals: true})
 
diff --git a/ssh_server.go b/ssh_server.go
index 690cbd4..7fd31c0 100644
--- a/ssh_server.go
+++ b/ssh_server.go
@@ -21,7 +21,7 @@ var (
 	server_public_key             go_ssh.PublicKey
 )
 
-func serve_ssh(listener net.Listener) error {
+func serveSSH(listener net.Listener) error {
 	var host_key_bytes []byte
 	var host_key go_ssh.Signer
 	var err error