From 8402acf959f8d8c8faad9c8d9e9f28c68b486c74 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Tue, 18 Mar 2025 20:10:45 +0800 Subject: Remove underscores from Go code, pt 1 --- config.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'config.go') 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 { -- cgit v1.2.3