*: remove all named and naked returns

mdlayher · mdlayher · commit 051287be6db3 · 2016-01-07T15:56:04.000-05:00
diff --git a/client_integration_test.go b/client_integration_test.go
@@ -1164,14 +1164,14 @@ func TestClientWalk(t *testing.T) {
 	makeTree(t)
 	errors := make([]error, 0, 10)
 	clear := true
-	markFn := func(walker *fs.Walker) (err error) {
+	markFn := func(walker *fs.Walker) error {
 		for walker.Step() {
-			err = mark(walker.Path(), walker.Stat(), walker.Err(), &errors, clear)
+			err := mark(walker.Path(), walker.Stat(), walker.Err(), &errors, clear)
 			if err != nil {
-				break
+				return err
 			}
 		}
-		return err
+		return nil
 	}
 	// Expect no errors.
 	err := markFn(sftp.Walk(tree.name))
diff --git a/packet.go b/packet.go
@@ -508,17 +508,18 @@ func (p sshFxpOpenPacket) MarshalBinary() ([]byte, error) {
 	return b, nil
 }
 
-func (p *sshFxpOpenPacket) UnmarshalBinary(b []byte) (err error) {
+func (p *sshFxpOpenPacket) UnmarshalBinary(b []byte) error {
+	var err error
 	if p.ID, b, err = unmarshalUint32Safe(b); err != nil {
-		return
+		return err
 	} else if p.Path, b, err = unmarshalStringSafe(b); err != nil {
-		return
+		return err
 	} else if p.Pflags, b, err = unmarshalUint32Safe(b); err != nil {
-		return
+		return err
 	} else if p.Flags, b, err = unmarshalUint32Safe(b); err != nil {
-		return
+		return err
 	}
-	return
+	return nil
 }
 
 type sshFxpReadPacket struct {
@@ -544,17 +545,18 @@ func (p sshFxpReadPacket) MarshalBinary() ([]byte, error) {
 	return b, nil
 }
 
-func (p *sshFxpReadPacket) UnmarshalBinary(b []byte) (err error) {
+func (p *sshFxpReadPacket) UnmarshalBinary(b []byte) error {
+	var err error
 	if p.ID, b, err = unmarshalUint32Safe(b); err != nil {
-		return
+		return err
 	} else if p.Handle, b, err = unmarshalStringSafe(b); err != nil {
-		return
+		return err
 	} else if p.Offset, b, err = unmarshalUint64Safe(b); err != nil {
-		return
+		return err
 	} else if p.Len, b, err = unmarshalUint32Safe(b); err != nil {
-		return
+		return err
 	}
-	return
+	return nil
 }
 
 type sshFxpRenamePacket struct {
@@ -578,15 +580,16 @@ func (p sshFxpRenamePacket) MarshalBinary() ([]byte, error) {
 	return b, nil
 }
 
-func (p *sshFxpRenamePacket) UnmarshalBinary(b []byte) (err error) {
+func (p *sshFxpRenamePacket) UnmarshalBinary(b []byte) error {
+	var err error
 	if p.ID, b, err = unmarshalUint32Safe(b); err != nil {
-		return
+		return err
 	} else if p.Oldpath, b, err = unmarshalStringSafe(b); err != nil {
-		return
+		return err
 	} else if p.Newpath, b, err = unmarshalStringSafe(b); err != nil {
-		return
+		return err
 	}
-	return
+	return nil
 }
 
 type sshFxpWritePacket struct {
@@ -615,22 +618,22 @@ func (p sshFxpWritePacket) MarshalBinary() ([]byte, error) {
 	return b, nil
 }
 
-func (p *sshFxpWritePacket) UnmarshalBinary(b []byte) (err error) {
+func (p *sshFxpWritePacket) UnmarshalBinary(b []byte) error {
+	var err error
 	if p.ID, b, err = unmarshalUint32Safe(b); err != nil {
-		return
+		return err
 	} else if p.Handle, b, err = unmarshalStringSafe(b); err != nil {
-		return
+		return err
 	} else if p.Offset, b, err = unmarshalUint64Safe(b); err != nil {
-		return
+		return err
 	} else if p.Length, b, err = unmarshalUint32Safe(b); err != nil {
-		return
+		return err
 	} else if uint32(len(b)) < p.Length {
-		err = errShortPacket
-		return
+		return errShortPacket
 	}
 
 	p.Data = append([]byte{}, b[:p.Length]...)
-	return
+	return nil
 }
 
 type sshFxpMkdirPacket struct {
@@ -654,7 +657,8 @@ func (p sshFxpMkdirPacket) MarshalBinary() ([]byte, error) {
 	return b, nil
 }
 
-func (p *sshFxpMkdirPacket) UnmarshalBinary(b []byte) (err error) {
+func (p *sshFxpMkdirPacket) UnmarshalBinary(b []byte) error {
+	var err error
 	if p.ID, b, err = unmarshalUint32Safe(b); err != nil {
 		return err
 	} else if p.Path, b, err = unmarshalStringSafe(b); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -1164,14 +1164,14 @@ func TestClientWalk(t *testing.T) {`
`1164`	`1164`	`makeTree(t)`
`1165`	`1165`	`errors := make([]error, 0, 10)`
`1166`	`1166`	`clear := true`
`1167`		`- markFn := func(walker *fs.Walker) (err error) {`
	`1167`	`+ markFn := func(walker *fs.Walker) error {`
`1168`	`1168`	`for walker.Step() {`
`1169`		`- err = mark(walker.Path(), walker.Stat(), walker.Err(), &errors, clear)`
	`1169`	`+ err := mark(walker.Path(), walker.Stat(), walker.Err(), &errors, clear)`
`1170`	`1170`	`if err != nil {`
`1171`		`- break`
	`1171`	`+ return err`
`1172`	`1172`	`}`
`1173`	`1173`	`}`
`1174`		`- return err`
	`1174`	`+ return nil`
`1175`	`1175`	`}`
`1176`	`1176`	`// Expect no errors.`
`1177`	`1177`	`err := markFn(sftp.Walk(tree.name))`