fixed some golangci-lint checking errors

Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

Author: axfor

client/resp.go

@@ -336,15 +336,15 @@ func (c *Conn) readResultsetStreaming(data []byte, binary bool, result *Result,
 return nil
 }
 
-func (c *Conn) readResultColumns(result *Result) (err error) {
+func (c *Conn) readResultColumns(result *Result) error {
 var i = 0
 var data []byte
-
+var err error
 for {
 rawPkgLen := len(result.RawPkg)
 result.RawPkg, err = c.ReadPacketReuseMem(result.RawPkg)
 if err != nil {
-return
+return err
 }
 data = result.RawPkg[rawPkgLen:]
 
@@ -361,15 +361,15 @@ func (c *Conn) readResultColumns(result *Result) (err error) {
 err = ErrMalformPacket
 }
 
-return
+return err
 }
 
 if result.Fields[i] == nil {
 result.Fields[i] = &Field{}
 }
 err = result.Fields[i].Parse(data)
 if err != nil {
-return
+return err
 }
 
 result.FieldNames[hack.String(result.Fields[i].Name)] = i
@@ -378,14 +378,15 @@ func (c *Conn) readResultColumns(result *Result) (err error) {
 }
 }
 
-func (c *Conn) readResultRows(result *Result, isBinary bool) (err error) {
+func (c *Conn) readResultRows(result *Result, isBinary bool) error {
 var data []byte
+var err error
 
 for {
 rawPkgLen := len(result.RawPkg)
 result.RawPkg, err = c.ReadPacketReuseMem(result.RawPkg)
 if err != nil {
-return
+return err
 }
 data = result.RawPkg[rawPkgLen:]
 
@@ -425,16 +426,17 @@ func (c *Conn) readResultRows(result *Result, isBinary bool) (err error) {
 return nil
 }
 
-func (c *Conn) readResultRowsStreaming(result *Result, isBinary bool, perRowCb SelectPerRowCallback) (err error) {
+func (c *Conn) readResultRowsStreaming(result *Result, isBinary bool, perRowCb SelectPerRowCallback) error {
 var (
 data []byte
 row []FieldValue
+err error
 )
 
 for {
 data, err = c.ReadPacketReuseMem(data[:0])
 if err != nil {
-return
+return err
 }
 
 // EOF Packet

mysql/field.go

@@ -41,50 +41,51 @@ const (
 FieldValueTypeString
 )
 
-func (f *Field) Parse(p FieldData) (err error) {
+func (f *Field) Parse(p FieldData) error {
 f.Data = p
 
 var n int
+var err error
 pos := 0
 //skip catelog, always def
 n, err = SkipLengthEncodedString(p)
 if err != nil {
-return
+return err
 }
 pos += n
 
 //schema
 f.Schema, _, n, err = LengthEncodedString(p[pos:])
 if err != nil {
-return
+return err
 }
 pos += n
 
 //table
 f.Table, _, n, err = LengthEncodedString(p[pos:])
 if err != nil {
-return
+return err
 }
 pos += n
 
 //org_table
 f.OrgTable, _, n, err = LengthEncodedString(p[pos:])
 if err != nil {
-return
+return err
 }
 pos += n
 
 //name
 f.Name, _, n, err = LengthEncodedString(p[pos:])
 if err != nil {
-return
+return err
 }
 pos += n
 
 //org_name
 f.OrgName, _, n, err = LengthEncodedString(p[pos:])
 if err != nil {
-return
+return err
 }
 pos += n
 
@@ -123,7 +124,7 @@ func (f *Field) Parse(p FieldData) (err error) {
 
 if pos+int(f.DefaultValueLength) > len(p) {
 err = ErrMalformPacket
-return
+return err
 }
 
 //default value string[$len]