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

diff --git a/libtransmission/announcer-udp.c b/libtransmission/announcer-udp.c
index 527048320ea36f076dcce2e9aba98619404ccee3..a6c1862dcb31e86cc37ee4d6da732c4720d6ad68 100644 (file)
--- a/libtransmission/announcer-udp.c
+++ b/libtransmission/announcer-udp.c
@@ -194,9 +194,9 @@ tau_scrape_request_new( const tr_scrape_request  * in,
 static void
 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 );
 }
 
@@ -222,10 +222,10 @@ tau_scrape_request_fail( tr_session                 * session,
 }
 
 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;
     request->response.did_timeout = false;
@@ -377,16 +377,17 @@ tau_announce_request_fail( tr_session                   * session,
 }
 
 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;
         resp->interval = evbuffer_read_ntoh_32( buf );
@@ -401,7 +402,6 @@ on_announce_response( tr_session                  * session,
     else
     {
         char * errmsg;
-        const size_t buflen = evbuffer_get_length( buf );
 
         if( ( action == TAU_ACTION_ERROR ) && ( buflen > 0 ) )
             errmsg = tr_strndup( evbuffer_pullup( buf, -1 ), buflen );
@@ -531,7 +531,7 @@ tau_tracker_send_reqs( struct tau_tracker * tracker )
     tr_ptrArray * reqs;
     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 );
     assert( tracker->connection_expiration_time > now );
@@ -559,7 +559,7 @@ tau_tracker_send_reqs( struct tau_tracker * tracker )
             dbgmsg( tracker->key, "sending scrape req %p", req );
             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 );
                 --i;
@@ -645,7 +645,7 @@ tau_tracker_timeout_reqs( struct tau_tracker * tracker )
 }
 
 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 )
         && tr_ptrArrayEmpty( &tracker->scrapes );
@@ -664,7 +664,7 @@ tau_tracker_upkeep( struct tau_tracker * tracker )
     }
 
     /* are there any requests pending? */
-    if( tau_tracker_is_empty( tracker ) )
+    if( tau_tracker_is_idle( tracker ) )
         return;
 
     /* if we don't have an address yet, try & get one now. */
@@ -804,7 +804,7 @@ tr_tracker_udp_upkeep( tr_session * session )
 }
 
 bool
-tr_tracker_udp_is_empty( const tr_session * session )
+tr_tracker_udp_is_idle( const tr_session * session )
 {
     int i;
     int n;
@@ -812,7 +812,7 @@ tr_tracker_udp_is_empty( const tr_session * session )
 
     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;
 
     return true;

diff --git a/libtransmission/announcer.h b/libtransmission/announcer.h
index 801fb56bf73a863aded98fa3858ccc94c844b159..3d81072da14cce3164f4bd7cd1104ee47281feee 100644 (file)
--- a/libtransmission/announcer.h
+++ b/libtransmission/announcer.h
@@ -112,7 +112,7 @@ void tr_tracker_udp_upkeep( tr_session * session );
 
 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 );
 
 
 

diff --git a/libtransmission/session.c b/libtransmission/session.c
index 3bf9d4180ad5f6740eed8a1680bb27adedd65685..591f4ae9d60e90fa09c6ca7aeee49caf4a65aeb4 100644 (file)
--- a/libtransmission/session.c
+++ b/libtransmission/session.c
@@ -1772,7 +1772,7 @@ sessionCloseImpl( void * vsession )
 
     /* 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 );
     }