From f6571af24fd1ed03ae97cf62ee25744db38ad1c8 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 31 Jan 2018 08:38:22 +0100
Subject: [PATCH] Nits

---
 dnscrypt-proxy/common.go       | 4 ++--
 dnscrypt-proxy/config.go       | 6 +++---
 dnscrypt-proxy/main.go         | 8 ++++----
 dnscrypt-proxy/plugin_cache.go | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dnscrypt-proxy/common.go b/dnscrypt-proxy/common.go
index 5406f6de..5b7741a0 100644
--- a/dnscrypt-proxy/common.go
+++ b/dnscrypt-proxy/common.go
@@ -31,8 +31,8 @@ var (
 )
 
 func PrefixWithSize(packet []byte) ([]byte, error) {
-	packet_len := len(packet)
-	if packet_len > 0xffff {
+	packetLen := len(packet)
+	if packetLen > 0xffff {
 		return packet, errors.New("Packet too large")
 	}
 	packet = append(append(packet, 0), 0)
diff --git a/dnscrypt-proxy/config.go b/dnscrypt-proxy/config.go
index f95c2a0a..3e29442e 100644
--- a/dnscrypt-proxy/config.go
+++ b/dnscrypt-proxy/config.go
@@ -104,7 +104,7 @@ type BlockIPConfig struct {
 	Format  string `toml:"log_format"`
 }
 
-func ConfigLoad(proxy *Proxy, svcFlag *string, config_file string) error {
+func ConfigLoad(proxy *Proxy, svcFlag *string) error {
 	version := flag.Bool("version", false, "Prints current proxy version")
 	configFile := flag.String("config", "dnscrypt-proxy.toml", "Path to the configuration file")
 	resolve := flag.String("resolve", "", "resolve a name using system libraries")
@@ -237,7 +237,7 @@ func (config *Config) loadSources(proxy *Proxy) error {
 		requiredProps |= ServerInformalPropertyNoFilter
 	}
 	for cfgSourceName, cfgSource := range config.SourcesConfig {
-		if err := config.loadSource(proxy, requiredProps, &cfgSourceName, &cfgSource); err != nil {
+		if err := config.loadSource(proxy, requiredProps, cfgSourceName, &cfgSource); err != nil {
 			return err
 		}
 	}
@@ -265,7 +265,7 @@ func (config *Config) loadSources(proxy *Proxy) error {
 	return nil
 }
 
-func (config *Config) loadSource(proxy *Proxy, requiredProps ServerInformalProperties, cfgSourceName *string, cfgSource *SourceConfig) error {
+func (config *Config) loadSource(proxy *Proxy, requiredProps ServerInformalProperties, cfgSourceName string, cfgSource *SourceConfig) error {
 	if cfgSource.URL == "" {
 		return fmt.Errorf("Missing URL for source [%s]", cfgSourceName)
 	}
diff --git a/dnscrypt-proxy/main.go b/dnscrypt-proxy/main.go
index 7b9f90e9..9929b622 100644
--- a/dnscrypt-proxy/main.go
+++ b/dnscrypt-proxy/main.go
@@ -13,8 +13,8 @@ import (
 )
 
 const (
-	AppVersion     = "2.0.0beta12"
-	ConfigFileName = "dnscrypt-proxy.toml"
+	AppVersion            = "2.0.0beta12"
+	DefaultConfigFileName = "dnscrypt-proxy.toml"
 )
 
 type App struct {
@@ -43,8 +43,8 @@ func main() {
 	app.proxy = Proxy{}
 	app.proxy.xTransport = NewXTransport(30 * time.Second)
 
-	cdFileDir(ConfigFileName)
-	if err := ConfigLoad(&app.proxy, svcFlag, ConfigFileName); err != nil {
+	cdFileDir(DefaultConfigFileName)
+	if err := ConfigLoad(&app.proxy, svcFlag); err != nil {
 		dlog.Fatal(err)
 	}
 	dlog.Noticef("Starting dnscrypt-proxy %s", AppVersion)
diff --git a/dnscrypt-proxy/plugin_cache.go b/dnscrypt-proxy/plugin_cache.go
index cbd095b9..7ede10f7 100644
--- a/dnscrypt-proxy/plugin_cache.go
+++ b/dnscrypt-proxy/plugin_cache.go
@@ -109,11 +109,11 @@ func (plugin *PluginCache) Eval(pluginsState *PluginsState, msg *dns.Msg) error
 	if plugin.cachedResponses.cache == nil {
 		return nil
 	}
-	cached_any, ok := plugin.cachedResponses.cache.Get(cacheKey)
+	cachedAny, ok := plugin.cachedResponses.cache.Get(cacheKey)
 	if !ok {
 		return nil
 	}
-	cached := cached_any.(CachedResponse)
+	cached := cachedAny.(CachedResponse)
 	if time.Now().After(cached.expiration) {
 		return nil
 	}