Skip to content

Commit cb2b427

Browse files
authored
Merge pull request #865 from andriikushch/fix-receiver-name
unify receiver name for conn struct methods
2 parents 2ff3cb3 + 75fb97b commit cb2b427

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

error.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -478,13 +478,13 @@ func errRecoverNoErrBadConn(err *error) {
478478
}
479479
}
480480

481-
func (c *conn) errRecover(err *error) {
481+
func (cn *conn) errRecover(err *error) {
482482
e := recover()
483483
switch v := e.(type) {
484484
case nil:
485485
// Do nothing
486486
case runtime.Error:
487-
c.bad = true
487+
cn.bad = true
488488
panic(v)
489489
case *Error:
490490
if v.Fatal() {
@@ -493,7 +493,7 @@ func (c *conn) errRecover(err *error) {
493493
*err = v
494494
}
495495
case *net.OpError:
496-
c.bad = true
496+
cn.bad = true
497497
*err = v
498498
case error:
499499
if v == io.EOF || v.(error).Error() == "remote error: handshake failure" {
@@ -503,13 +503,13 @@ func (c *conn) errRecover(err *error) {
503503
}
504504

505505
default:
506-
c.bad = true
506+
cn.bad = true
507507
panic(fmt.Sprintf("unknown error: %#v", e))
508508
}
509509

510510
// Any time we return ErrBadConn, we need to remember it since *Tx doesn't
511511
// mark the connection bad in database/sql.
512512
if *err == driver.ErrBadConn {
513-
c.bad = true
513+
cn.bad = true
514514
}
515515
}

0 commit comments

Comments
 (0)