Changeset 12237

Timestamp:

Mar 26, 2011, 10:22:25 AM (12 years ago)

Author:

jordan

Message:

(trunk libT) minor code cleanup in announcer-udp: whitespace & function names

Location:

trunk/libtransmission

Files:

• announcer-udp.c (modified) (10 diffs)
• announcer.h (modified) (1 diff)
• session.c (modified) (1 diff)

trunk/libtransmission/announcer-udp.c

@@ -195 +195 @@
 tau_scrape_request_free( struct tau_scrape_request * req )
 {
-    tr_free( req->payload );
     tr_free( req->response.errmsg );
     tr_free( req->response.url );
+    tr_free( req->payload );
     tr_free( req );
 }
@@ -223 +223 @@
 
 static void
-on_scrape_response( tr_session                  * session,
-                     struct tau_scrape_request  * request,
-                     tau_action_t                 action,
-                     struct evbuffer            * buf )
+on_scrape_response( tr_session                 * session,
+                    struct tau_scrape_request  * request,
+                    tau_action_t                 action,
+                    struct evbuffer            * buf )
 {
     request->response.did_connect = true;
@@ -378 +378 @@
 
 static void
-on_announce_response( tr_session                  * session,
-                     struct tau_announce_request  * request,
-                     tau_action_t                   action,
-                     struct evbuffer              * buf )
-{
+on_announce_response( tr_session                   * session,
+                      struct tau_announce_request  * request,
+                      tau_action_t                   action,
+                      struct evbuffer              * buf )
+{
+    const size_t buflen = evbuffer_get_length( buf );
+
     request->response.did_connect = true;
     request->response.did_timeout = false;
 
-    if( ( action == TAU_ACTION_ANNOUNCE )
-        && ( evbuffer_get_length( buf ) >= 3*sizeof(uint32_t) ) )
+    if( ( action == TAU_ACTION_ANNOUNCE ) && ( buflen >= 3*sizeof(uint32_t) ) )
     {
         tr_announce_response * resp = &request->response;
@@ -402 +403 @@
     {
         char * errmsg;
-        const size_t buflen = evbuffer_get_length( buf );
 
         if( ( action == TAU_ACTION_ERROR ) && ( buflen > 0 ) )
@@ -532 +532 @@
     const time_t now = tr_time( );
 
-    assert( tracker->is_asking_dns == 0 );
+    assert( tracker->is_asking_dns == false );
     assert( tracker->connecting_at == 0 );
     assert( tracker->addr != NULL );
@@ -560 +560 @@
             req->sent_at = now;
             tau_tracker_send_request( tracker, req->payload, req->payload_len );
-            if( req->callback == NULL) {
+            if( req->callback == NULL ) {
                 tau_scrape_request_free( req );
                 tr_ptrArrayRemove( reqs, i );
@@ -646 +646 @@
 
 static bool
-tau_tracker_is_empty( const struct tau_tracker * tracker )
+tau_tracker_is_idle( const struct tau_tracker * tracker )
 {
     return tr_ptrArrayEmpty( &tracker->announces )
@@ -665 +665 @@
 
     /* are there any requests pending? */
-    if( tau_tracker_is_empty( tracker ) )
+    if( tau_tracker_is_idle( tracker ) )
         return;
 
@@ -805 +805 @@
 
 bool
-tr_tracker_udp_is_empty( const tr_session * session )
+tr_tracker_udp_is_idle( const tr_session * session )
 {
     int i;
@@ -813 +813 @@
     if( tau != NULL )
         for( i=0, n=tr_ptrArraySize(&tau->trackers); i<n; ++i )
-            if( !tau_tracker_is_empty( tr_ptrArrayNth( &tau->trackers, i ) ) )
+            if( !tau_tracker_is_idle( tr_ptrArrayNth( &tau->trackers, i ) ) )
                 return false;
 

trunk/libtransmission/announcer.h

@@ -113 +113 @@
 void tr_tracker_udp_close( tr_session * session );
 
-bool tr_tracker_udp_is_empty( const tr_session * session );
+bool tr_tracker_udp_is_idle( const tr_session * session );
 
 

trunk/libtransmission/session.c

@@ -1773 +1773 @@
     /* gotta keep udp running long enough to send out all
        the &event=stopped UDP tracker messages */
-    while( !tr_tracker_udp_is_empty( session ) ) {
+    while( !tr_tracker_udp_is_idle( session ) ) {
         tr_tracker_udp_upkeep( session );
         tr_wait_msec( 100 );