From 9ebaf8cac9c961020c33fb7e75b0dff50477f0ec Mon Sep 17 00:00:00 2001 From: Damian Gryski Date: Tue, 29 Mar 2016 10:58:54 +0200 Subject: [PATCH] Fix os_user lint issues --- driver.go | 10 +++++----- packets.go | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/driver.go b/driver.go index dc912336e..ad311f25e 100644 --- a/driver.go +++ b/driver.go @@ -34,8 +34,8 @@ type MySQLDriver struct{} type DialFunc func(addr string) (net.Conn, error) var pid string -var os_user string -var os_user_full string +var osUser string +var osUserFull string var dials map[string]DialFunc @@ -171,10 +171,10 @@ func handleAuthResult(mc *mysqlConn, cipher []byte) error { func init() { pid = strconv.Itoa(os.Getpid()) - os_user_entry, err := user.Current() + osUserEntry, err := user.Current() if err == nil { - os_user_full = os_user_entry.Name - os_user = os_user_entry.Username + osUserFull = osUserEntry.Name + osUser = osUserEntry.Username } sql.Register("mysql", &MySQLDriver{}) } diff --git a/packets.go b/packets.go index 3941912d5..3aef4febd 100644 --- a/packets.go +++ b/packets.go @@ -267,11 +267,11 @@ func (mc *mysqlConn) writeAuthPacket(cipher []byte) error { "_platform": runtime.GOARCH, "program_name": path.Base(os.Args[0]), } - if len(os_user_full) > 0 { - attrs["_os_user_full"] = os_user_full + if len(osUserFull) > 0 { + attrs["_os_user_full"] = osUserFull } - if len(os_user) > 0 { - attrs["_os_user"] = os_user + if len(osUser) > 0 { + attrs["_os_user"] = osUser } // Merge the custom attributes and the default attributes