]> Sergey Matveev's repositories - btrtrc.git/commitdiff
vet some printfs
authorMatt Joiner <anacrolix@gmail.com>
Thu, 26 Jun 2014 07:30:16 +0000 (17:30 +1000)
committerMatt Joiner <anacrolix@gmail.com>
Thu, 26 Jun 2014 07:30:16 +0000 (17:30 +1000)
client.go
connection.go

index f99d6af164f3dfe2fb9a137f9e4b3a84fb482cb5..63d6d52ad1c605ef174e139c37187ac4fd715e68 100644 (file)
--- a/client.go
+++ b/client.go
@@ -435,10 +435,10 @@ func (me *Client) connectionLoop(t *torrent, c *connection) error {
                        p := make([]byte, msg.Length)
                        n, err := t.Data.ReadAt(p, int64(t.PieceLength(0))*int64(msg.Index)+int64(msg.Begin))
                        if err != nil {
-                               return fmt.Errorf("reading t data to serve request %s: %s", request, err)
+                               return fmt.Errorf("reading t data to serve request %q: %s", request, err)
                        }
                        if n != int(msg.Length) {
-                               return fmt.Errorf("bad request: %s", msg)
+                               return fmt.Errorf("bad request: %v", msg)
                        }
                        c.Post(pp.Message{
                                Type:  pp.Piece,
@@ -883,7 +883,7 @@ func (me *Client) downloadedChunk(t *torrent, c *connection, msg *pp.Message) er
        // Cancel pending requests for this chunk.
        for _, c := range t.Conns {
                if me.connCancel(t, c, req) {
-                       log.Print("cancelled concurrent request for %s", req)
+                       log.Print("cancelled concurrent request for %v", req)
                        me.replenishConnRequests(t, c)
                }
        }
index a0e45ec36fe22dcef0ede2a2017a56f7a0d66140..c56329f6ebec9640da1c8b8b19efdf733aca5a58 100644 (file)
@@ -261,7 +261,7 @@ func (conn *connection) writeOptimizer(keepAliveDelay time.Duration) {
                                        elemMsg := e.Value.(peer_protocol.Message)
                                        if elemMsg.Type == peer_protocol.Request && msg.Index == elemMsg.Index && msg.Begin == elemMsg.Begin && msg.Length == elemMsg.Length {
                                                pending.Remove(e)
-                                               log.Print("optimized cancel! %q", msg)
+                                               log.Printf("optimized cancel! %v", msg)
                                                break event
                                        }
                                }