From: Matt Joiner <anacrolix@gmail.com>
Date: Thu, 26 Jun 2014 07:30:16 +0000 (+1000)
Subject: vet some printfs
X-Git-Tag: v1.0.0~1708
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=de769cdce7d60e9413d9e638033d9dbb9276bd0e;p=btrtrc.git

vet some printfs
---

diff --git a/client.go b/client.go
index f99d6af1..63d6d52a 100644
--- 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)
 		}
 	}
diff --git a/connection.go b/connection.go
index a0e45ec3..c56329f6 100644
--- a/connection.go
+++ b/connection.go
@@ -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
 					}
 				}