Changeset 13868 for trunk/libtransmission/tr-lpd.c

Timestamp:

Jan 25, 2013, 11:34:20 PM (8 years ago)

Author:

jordan

Message:

make all the log functions/structs/enums use a single 'tr_log' namespace, such as tr_logGetQueue, tr_logAddInfo, tr_logIsLevelActive

File:

• trunk/libtransmission/tr-lpd.c (modified) (11 diffs)

trunk/libtransmission/tr-lpd.c

@@ -49 +49 @@
 /* libT */
 #include "transmission.h"
+#include "log.h"
 #include "net.h"
 #include "peer-mgr.h" /* tr_peerMgrAddPex () */
@@ -281 +282 @@
         return -1;
 
-    tr_ndbg ("LPD", "Initialising Local Peer Discovery");
+    tr_logAddNamedDbg ("LPD", "Initialising Local Peer Discovery");
 
     /* setup datagram socket (receive) */
@@ -352 +353 @@
     tr_timerAdd (upkeep_timer, UPKEEP_INTERVAL_SECS, 0);
 
-    tr_ndbg ("LPD", "Local Peer Discovery initialised");
+    tr_logAddNamedDbg ("LPD", "Local Peer Discovery initialised");
 
     return 1;
@@ -363 +364 @@
         lpd_socket = lpd_socket2 = -1;
         session = NULL;
-        tr_ndbg ("LPD", "LPD initialisation failed (errno = %d)", save);
+        tr_logAddNamedDbg ("LPD", "LPD initialisation failed (errno = %d)", save);
         errno = save;
     }
@@ -376 +377 @@
         return;
 
-    tr_ndbg ("LPD", "Uninitialising Local Peer Discovery");
+    tr_logAddNamedDbg ("LPD", "Uninitialising Local Peer Discovery");
 
     event_free (lpd_event);
@@ -387 +388 @@
     evutil_closesocket (lpd_socket);
     evutil_closesocket (lpd_socket2);
-    tr_ndbg ("LPD", "Done uninitialising Local Peer Discovery");
+    tr_logAddNamedDbg ("LPD", "Done uninitialising Local Peer Discovery");
 
     session = NULL;
@@ -471 +472 @@
     }
 
-    tr_tordbg (t, "LPD announce message away");
+    tr_logAddTorDbg (t, "LPD announce message away");
 
     return true;
@@ -532 +533 @@
             /* we found a suitable peer, add it to the torrent */
             tr_peerMgrAddPex (tor, TR_PEER_FROM_LPD, peer, -1);
-            tr_tordbg (tor, "Learned %d local peer from LPD (%s:%u)",
+            tr_logAddTorDbg (tor, "Learned %d local peer from LPD (%s:%u)",
                 1, tr_address_to_string (&peer->addr), peerPort);
 
@@ -540 +541 @@
         }
         else
-            tr_ndbg ("LPD", "Cannot serve torrent #%s", hashString);
+            tr_logAddNamedDbg ("LPD", "Cannot serve torrent #%s", hashString);
     }
 
@@ -609 +610 @@
 
         if (lpd_unsolicitedMsgCounter < 0)
-            tr_ninf ("LPD", "Dropped %d announces in the last interval (max. %d "
+            tr_logAddNamedInfo ("LPD", "Dropped %d announces in the last interval (max. %d "
                      "allowed)", -lpd_unsolicitedMsgCounter, maxAnnounceCap);
 
@@ -667 +668 @@
         }
 
-        tr_ndbg ("LPD", "Discarded invalid multicast message");
-    }
-}
-
+        tr_logAddNamedDbg ("LPD", "Discarded invalid multicast message");
+    }
+}
+