Rename errors consistent to "err"

Author: julienschmidt

connection.go

@@ -46,19 +46,19 @@ type serverSettings struct {
 }
 
 // Handles parameters set in DSN
-func (mc *mysqlConn) handleParams() (e error) {
+func (mc *mysqlConn) handleParams() (err error) {
 	for param, val := range mc.cfg.params {
 		switch param {
 		// Charset
 		case "charset":
 			charsets := strings.Split(val, ",")
 			for _, charset := range charsets {
-				e = mc.exec("SET NAMES " + charset)
-				if e == nil {
+				err = mc.exec("SET NAMES " + charset)
+				if err == nil {
 					break
 				}
 			}
-			if e != nil {
+			if err != nil {
 				return
 			}
 
@@ -72,8 +72,8 @@ func (mc *mysqlConn) handleParams() (e error) {
 
 		// System Vars
 		default:
-			e = mc.exec("SET " + param + "=" + val + "")
-			if e != nil {
+			err = mc.exec("SET " + param + "=" + val + "")
+			if err != nil {
 				return
 			}
 		}
@@ -83,15 +83,15 @@ func (mc *mysqlConn) handleParams() (e error) {
 }
 
 func (mc *mysqlConn) Begin() (driver.Tx, error) {
-	e := mc.exec("START TRANSACTION")
-	if e != nil {
-		return nil, e
+	err := mc.exec("START TRANSACTION")
+	if err != nil {
+		return nil, err
 	}
 
-	return &mysqlTx{mc}, e
+	return &mysqlTx{mc}, err
 }
 
-func (mc *mysqlConn) Close() (e error) {
+func (mc *mysqlConn) Close() (err error) {
 	mc.writeCommandPacket(COM_QUIT)
 	mc.bufReader = nil
 	mc.netConn.Close()
@@ -101,36 +101,36 @@ func (mc *mysqlConn) Close() (e error) {
 
 func (mc *mysqlConn) Prepare(query string) (driver.Stmt, error) {
 	// Send command
-	e := mc.writeCommandPacket(COM_STMT_PREPARE, query)
-	if e != nil {
-		return nil, e
+	err := mc.writeCommandPacket(COM_STMT_PREPARE, query)
+	if err != nil {
+		return nil, err
 	}
 
 	stmt := mysqlStmt{new(stmtContent)}
 	stmt.mc = mc
 
 	// Read Result
 	var columnCount uint16
-	columnCount, e = stmt.readPrepareResultPacket()
-	if e != nil {
-		return nil, e
+	columnCount, err = stmt.readPrepareResultPacket()
+	if err != nil {
+		return nil, err
 	}
 
 	if stmt.paramCount > 0 {
-		stmt.params, e = stmt.mc.readColumns(stmt.paramCount)
-		if e != nil {
-			return nil, e
+		stmt.params, err = stmt.mc.readColumns(stmt.paramCount)
+		if err != nil {
+			return nil, err
 		}
 	}
 
 	if columnCount > 0 {
-		_, e = stmt.mc.readUntilEOF()
-		if e != nil {
-			return nil, e
+		_, err = stmt.mc.readUntilEOF()
+		if err != nil {
+			return nil, err
 		}
 	}
 
-	return stmt, e
+	return stmt, err
 }
 
 func (mc *mysqlConn) Exec(query string, args []driver.Value) (driver.Result, error) {
@@ -141,40 +141,40 @@ func (mc *mysqlConn) Exec(query string, args []driver.Value) (driver.Result, err
 	mc.affectedRows = 0
 	mc.insertId = 0
 
-	e := mc.exec(query)
-	if e != nil {
-		return nil, e
+	err := mc.exec(query)
+	if err != nil {
+		return nil, err
 	}
 
 	return &mysqlResult{
 			affectedRows: int64(mc.affectedRows),
 			insertId:     int64(mc.insertId)},
-		e
+		err
 }
 
 // Internal function to execute commands
-func (mc *mysqlConn) exec(query string) (e error) {
+func (mc *mysqlConn) exec(query string) (err error) {
 	// Send command
-	e = mc.writeCommandPacket(COM_QUERY, query)
-	if e != nil {
+	err = mc.writeCommandPacket(COM_QUERY, query)
+	if err != nil {
 		return
 	}
 
 	// Read Result
 	var resLen int
-	resLen, e = mc.readResultSetHeaderPacket()
-	if e != nil {
+	resLen, err = mc.readResultSetHeaderPacket()
+	if err != nil {
 		return
 	}
 
 	if resLen > 0 {
-		_, e = mc.readUntilEOF()
-		if e != nil {
+		_, err = mc.readUntilEOF()
+		if err != nil {
 			return
 		}
 
-		mc.affectedRows, e = mc.readUntilEOF()
-		if e != nil {
+		mc.affectedRows, err = mc.readUntilEOF()
+		if err != nil {
 			return
 		}
 	}
@@ -188,27 +188,27 @@ func (mc *mysqlConn) Query(query string, args []driver.Value) (driver.Rows, erro
 	}
 
 	// Send command
-	e := mc.writeCommandPacket(COM_QUERY, query)
-	if e != nil {
-		return nil, e
+	err := mc.writeCommandPacket(COM_QUERY, query)
+	if err != nil {
+		return nil, err
 	}
 
 	// Read Result
 	var resLen int
-	resLen, e = mc.readResultSetHeaderPacket()
-	if e != nil {
-		return nil, e
+	resLen, err = mc.readResultSetHeaderPacket()
+	if err != nil {
+		return nil, err
 	}
 
 	rows := mysqlRows{&rowsContent{mc, false, nil, false}}
 
 	if resLen > 0 {
 		// Columns
-		rows.content.columns, e = mc.readColumns(resLen)
-		if e != nil {
-			return nil, e
+		rows.content.columns, err = mc.readColumns(resLen)
+		if err != nil {
+			return nil, err
 		}
 	}
 
-	return rows, e
+	return rows, err
 }

driver.go

@@ -1,6 +1,6 @@
 // Copyright 2012 Julien Schmidt. All rights reserved.
 // http://www.julienschmidt.com
-// 
+//
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -21,44 +21,44 @@ type mysqlDriver struct{}
 // See https://github.com/Go-SQL-Driver/MySQL#dsn-data-source-name for how
 // the DSN string is formated
 func (d *mysqlDriver) Open(dsn string) (driver.Conn, error) {
-	var e error
+	var err error
 
 	// New mysqlConn
 	mc := new(mysqlConn)
 	mc.cfg = parseDSN(dsn)
 
 	// Connect to Server
-	mc.netConn, e = net.Dial(mc.cfg.net, mc.cfg.addr)
-	if e != nil {
-		return nil, e
+	mc.netConn, err = net.Dial(mc.cfg.net, mc.cfg.addr)
+	if err != nil {
+		return nil, err
 	}
 	mc.bufReader = bufio.NewReader(mc.netConn)
 
-	// Reading Handshake Initialization Packet 
-	e = mc.readInitPacket()
-	if e != nil {
-		return nil, e
+	// Reading Handshake Initialization Packet
+	err = mc.readInitPacket()
+	if err != nil {
+		return nil, err
 	}
 
 	// Send Client Authentication Packet
-	e = mc.writeAuthPacket()
-	if e != nil {
-		return nil, e
+	err = mc.writeAuthPacket()
+	if err != nil {
+		return nil, err
 	}
 
 	// Read Result Packet
-	e = mc.readResultOK()
-	if e != nil {
-		return nil, e
+	err = mc.readResultOK()
+	if err != nil {
+		return nil, err
 	}
 
 	// Handle DSN Params
-	e = mc.handleParams()
-	if e != nil {
-		return nil, e
+	err = mc.handleParams()
+	if err != nil {
+		return nil, err
 	}
 
-	return mc, e
+	return mc, err
 }
 
 func init() {