gopkg/pgx
2
0
Fork 0
Code Activity

Remove unnecessary defer

Browse Source
This commit is contained in:
Jack Christensen
2014-04-24 21:26:04 -06:00
parent 97f9fe2209
commit 7ee9b3c7ee
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connection.go
+9 -11
View File
@@ -832,21 +832,19 @@ func (c *Connection) rxMsgHeader() (t byte, bodySize int32, err error) {
return
}
func (c *Connection) rxMsgBody(bodySize int32) (buf *bytes.Buffer, err error) {
func (c *Connection) rxMsgBody(bodySize int32) (*bytes.Buffer, error) {
if !c.alive {
err = errors.New("Connection is dead")
return
return nil, errors.New("Connection is dead")
}
defer func() {
if err != nil {
c.die(err)
}
}()
buf := c.getBuf()
_, err := io.CopyN(buf, c.conn, int64(bodySize))
if err != nil {
c.die(err)
return nil, err
}
buf = c.getBuf()
_, err = io.CopyN(buf, c.conn, int64(bodySize))
return
return buf, nil
}
func (c *Connection) rxAuthenticationX(r *MessageReader) (err error) {