Changeset 14203

Timestamp:

Sep 9, 2013, 1:32:09 AM (9 years ago)

Author:

jordan

Message:

fix pedantic compiler warnings

Location:

trunk/libtransmission

Files:

• announcer-udp.c (modified) (5 diffs)
• peer-io.c (modified) (1 diff)
• peer-msgs.c (modified) (1 diff)
• resume.c (modified) (1 diff)
• session.c (modified) (3 diffs)
• torrent.c (modified) (1 diff)
• web.c (modified) (2 diffs)

trunk/libtransmission/announcer-udp.c

@@ -548 +548 @@
         struct tau_announce_request * req = tr_ptrArrayNth (reqs, i);
         if (!req->sent_at) {
-            dbgmsg (tracker->key, "sending announce req %p", req);
+            dbgmsg (tracker->key, "sending announce req %p", (void*)req);
             req->sent_at = now;
             tau_tracker_send_request (tracker, req->payload, req->payload_len);
@@ -564 +564 @@
         struct tau_scrape_request * req = tr_ptrArrayNth (reqs, i);
         if (!req->sent_at) {
-            dbgmsg (tracker->key, "sending scrape req %p", req);
+            dbgmsg (tracker->key, "sending scrape req %p", (void*)req);
             req->sent_at = now;
             tau_tracker_send_request (tracker, req->payload, req->payload_len);
@@ -629 +629 @@
         struct tau_announce_request * req = tr_ptrArrayNth (reqs, i);
         if (cancel_all || (req->created_at + TAU_REQUEST_TTL < now)) {
-            dbgmsg (tracker->key, "timeout announce req %p", req);
+            dbgmsg (tracker->key, "timeout announce req %p", (void*)req);
             tau_announce_request_fail (req, false, true, NULL);
             tau_announce_request_free (req);
@@ -642 +642 @@
         struct tau_scrape_request * req = tr_ptrArrayNth (reqs, i);
         if (cancel_all || (req->created_at + TAU_REQUEST_TTL < now)) {
-            dbgmsg (tracker->key, "timeout scrape req %p", req);
+            dbgmsg (tracker->key, "timeout scrape req %p", (void*)req);
             tau_scrape_request_fail (req, false, true, NULL);
             tau_scrape_request_free (req);
@@ -692 +692 @@
 
     dbgmsg (tracker->key, "addr %p -- connected %d (%"TR_PRIuSIZE" %"TR_PRIuSIZE") -- connecting_at %"TR_PRIuSIZE,
-            tracker->addr,
-          (int)(tracker->connection_expiration_time > now), (size_t)tracker->connection_expiration_time, (size_t)now,
-          (size_t)tracker->connecting_at);
+            (void*)tracker->addr,
+            (int)(tracker->connection_expiration_time > now),
+            (size_t)tracker->connection_expiration_time,
+            (size_t)now,
+            (size_t)tracker->connecting_at);
 
     /* also need a valid connection ID... */

trunk/libtransmission/peer-io.c

@@ -631 +631 @@
     tr_bandwidthConstruct (&io->bandwidth, session, parent);
     tr_bandwidthSetPeer (&io->bandwidth, io);
-    dbgmsg (io, "bandwidth is %p; its parent is %p", &io->bandwidth, parent);
-    dbgmsg (io, "socket is %d, utp_socket is %p", socket, utp_socket);
+    dbgmsg (io, "bandwidth is %p; its parent is %p", (void*)&io->bandwidth, (void*)parent);
+    dbgmsg (io, "socket is %d, utp_socket is %p", socket, (void*)utp_socket);
 
     if (io->socket >= 0) {

trunk/libtransmission/peer-msgs.c

@@ -1923 +1923 @@
         const size_t len = evbuffer_get_length (msgs->outMessages);
         /* flush the protocol messages */
-        dbgmsg (msgs, "flushing outMessages... to %p (length is %"TR_PRIuSIZE")", msgs->io, len);
+        dbgmsg (msgs, "flushing outMessages... to %p (length is %"TR_PRIuSIZE")", (void*)msgs->io, len);
         tr_peerIoWriteBuf (msgs->io, msgs->outMessages, false);
         msgs->clientSentAnythingAt = now;

trunk/libtransmission/resume.c

@@ -166 +166 @@
     {
       tr_logAddTorDbg (tor, "Couldn't load DND flags. DND list (%p) has %"TR_PRIuSIZE" children; torrent has %d files",
-                       list, tr_variantListSize (list), (int)n);
+                       (void*)list, tr_variantListSize (list), (int)n);
     }
 

trunk/libtransmission/session.c

@@ -694 +694 @@
 
   dbgmsg ("tr_sessionInit: the session's top-level bandwidth object is %p",
-          &session->bandwidth);
+          (void*)&session->bandwidth);
 
   tr_variantInitDict (&settings, 0);
@@ -1869 +1869 @@
   assert (tr_isSession (session));
 
-  dbgmsg ("shutting down transmission session %p... now is %"TR_PRIuSIZE", deadline is %"TR_PRIuSIZE, session, (size_t)time (NULL), (size_t)deadline);
+  dbgmsg ("shutting down transmission session %p... now is %"TR_PRIuSIZE", deadline is %"TR_PRIuSIZE, (void*)session, (size_t)time (NULL), (size_t)deadline);
 
   /* close the session */
@@ -1887 +1887 @@
     {
       dbgmsg ("waiting on port unmap (%p) or announcer (%p)... now %"TR_PRIuSIZE" deadline %"TR_PRIuSIZE,
-              session->shared, session->announcer, (size_t)time (NULL), (size_t)deadline);
+              (void*)session->shared, (void*)session->announcer, (size_t)time (NULL), (size_t)deadline);
       tr_wait_msec (50);
     }

trunk/libtransmission/torrent.c

@@ -2878 +2878 @@
   tr_ptrArray files = TR_PTR_ARRAY_INIT;
   tr_ptrArray folders = TR_PTR_ARRAY_INIT;
-  const void * const vstrcmp = strcmp;
+  PtrArrayCompareFunc vstrcmp = (PtrArrayCompareFunc)strcmp;
   const char * const top = tor->currentDir;
 

trunk/libtransmission/web.c

@@ -134 +134 @@
 
   evbuffer_add (task->response, ptr, byteCount);
-  dbgmsg ("wrote %"TR_PRIuSIZE" bytes to task %p's buffer", byteCount, task);
+  dbgmsg ("wrote %"TR_PRIuSIZE" bytes to task %p's buffer", byteCount, (void*)task);
   return byteCount;
 }
@@ -238 +238 @@
 {
   struct tr_web_task * task = vtask;
-  dbgmsg ("finished web task %p; got %ld", task, task->code);
+  dbgmsg ("finished web task %p; got %ld", (void*)task, task->code);
 
   if (task->done_func != NULL)