Several trivial fixes

diff --git a/bencode/decode.go b/bencode/decode.go
index e90df6a224b8fe0a2a4f581a97358fe04eed0f08..2ab9c01792b61c4a9d7de92db19eb71c429b6694 100644 (file)
--- a/bencode/decode.go
+++ b/bencode/decode.go
@@ -490,7 +490,6 @@ func (d *decoder) parse_value_interface() (interface{}, bool) {
                        What:   errors.New("unknown value type (invalid bencode?)"),
                })
        }
-       panic("unreachable")
 }
 
 func (d *decoder) parse_int_interface() interface{} {

diff --git a/client.go b/client.go
index 72da23214ad35255080db90edc6eb28b100a8d61..3eef1580cecc54fb7e677d8abab76295736894db 100644 (file)
--- a/client.go
+++ b/client.go
@@ -1064,7 +1064,7 @@ func (cl *Client) receiveHandshakes(c *connection) (t *torrent, err error) {
        }
        ih, ok, err := cl.connBTHandshake(c, nil)
        if err != nil {
-               fmt.Errorf("error during bt handshake: %s", err)
+               err = fmt.Errorf("error during bt handshake: %s", err)
                return
        }
        if !ok {

diff --git a/dht/dht.go b/dht/dht.go
index d60fd481195f0abdc90d79233ecf04e3011ac007..bd29ce6476936a0b6ff7c7003b04985efc8100bf 100644 (file)
--- a/dht/dht.go
+++ b/dht/dht.go
@@ -596,7 +596,7 @@ func (s *Server) processPacket(b []byte, addr dHTAddr) {
                                        return
                                }
                        }
-                       log.Printf("%s: received bad krpc message from %s: %s: %q", s, addr, err, b)
+                       log.Printf("%s: received bad krpc message from %s: %s: %+q", s, addr, err, b)
                }()
                return
        }