Changeset 14189

Timestamp:

Sep 8, 2013, 5:29:25 PM (9 years ago)

Author:

jordan

Message:

correct function pointer type correctness. mikedld

Location:

trunk/libtransmission

Files:

• announcer.c (modified) (6 diffs)
• peer-msgs.c (modified) (3 diffs)

trunk/libtransmission/announcer.c

@@ -408 +408 @@
     int tracker_count;
 
-    tr_tracker_callback * callback;
+    tr_tracker_callback callback;
     void * callbackData;
 }
@@ -482 +482 @@
             event.tracker = tier->currentTracker->announce;
 
-        tiers->callback (tier->tor, &event, tiers->callbackData);
+        (*tiers->callback) (tier->tor, &event, tiers->callbackData);
     }
 }
@@ -534 +534 @@
         dbgmsg (tier, "got %d peers; seed prob %d", n, (int)e.seedProbability);
 
-        tier->tor->tiers->callback (tier->tor, &e, NULL);
+        (*tier->tor->tiers->callback) (tier->tor, &e, NULL);
     }
 }
@@ -692 +692 @@
 tr_torrent_tiers *
 tr_announcerAddTorrent (tr_torrent           * tor,
-                        tr_tracker_callback  * callback,
+                        tr_tracker_callback    callback,
                         void                 * callbackData)
 {
@@ -1201 +1201 @@
 announce_request_delegate (tr_announcer               * announcer,
                            tr_announce_request        * request,
-                           tr_announce_response_func  * callback,
+                           tr_announce_response_func    callback,
                            void                       * callback_data)
 {
@@ -1398 +1398 @@
 scrape_request_delegate (tr_announcer             * announcer,
                          const tr_scrape_request  * request,
-                         tr_scrape_response_func  * callback,
+                         tr_scrape_response_func    callback,
                          void                     * callback_data)
 {

trunk/libtransmission/peer-msgs.c

@@ -224 +224 @@
   tr_torrent *           torrent;
 
-  tr_peer_callback      * callback;
+  tr_peer_callback        callback;
   void                  * callbackData;
 
@@ -480 +480 @@
 {
   if (msgs->callback != NULL)
-    msgs->callback (&msgs->peer, e, msgs->callbackData);
+    (*msgs->callback) (&msgs->peer, e, msgs->callbackData);
 }
 
@@ -2606 +2606 @@
 tr_peerMsgsNew (struct tr_torrent    * torrent,
                 struct tr_peerIo     * io,
-                tr_peer_callback     * callback,
+                tr_peer_callback       callback,
                 void                 * callbackData)
 {