Changeset 4279

Timestamp:

Dec 22, 2007, 4:11:17 AM (14 years ago)

Author:

charles

Message:

fix indentation errors in r4278.
fix consistency errors between ctor and the new functions in r4278.

Location:

trunk

Files:

• gtk/torrent-inspector.c (modified) (3 diffs)
• libtransmission/torrent.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (1 diff)

trunk/gtk/torrent-inspector.c

@@ -1581 +1581 @@
 max_peers_spun_cb( GtkSpinButton * spin, gpointer gtor )
 {
-  const uint16_t maxConnectedPeers = gtk_spin_button_get_value( spin );
-  tr_torrentSetPeerLimits( tr_torrent_handle( gtor ), maxConnectedPeers, 0 );
+  const uint16_t n = gtk_spin_button_get_value( spin );
+  tr_torrentSetMaxConnectedPeers( tr_torrent_handle( gtor ), n );
 }
 
@@ -1588 +1588 @@
 options_page_new ( TrTorrent * gtor )
 {
-  uint8_t maxUnchokedPeers;
   uint16_t maxConnectedPeers;
   int i, row;
@@ -1631 +1630 @@
   hig_workarea_add_section_spacer (t, row, 1);
 
-    tr_torrentGetPeerLimits( tor, &maxConnectedPeers, &maxUnchokedPeers );
+    maxConnectedPeers = tr_torrentGetMaxConnectedPeers( tor );
     w = gtk_spin_button_new_with_range( 1, 3000, 5 );
     gtk_spin_button_set_value( GTK_SPIN_BUTTON( w ), maxConnectedPeers );

trunk/libtransmission/torrent.c

@@ -1207 +1207 @@
 
 void
-tr_torrentSetPeerLimit( tr_torrent  * tor,
-                         uint16_t      maxConnectedPeers )
+tr_torrentSetMaxConnectedPeers( tr_torrent  * tor,
+                                uint16_t      maxConnectedPeers )
 {
     tor->maxConnectedPeers = maxConnectedPeers;
@@ -1214 +1214 @@
 
 void
-tr_torrentSetPeerUnchokedLimit( tr_torrent  * tor,
-                         uint8_t       maxUnchokedPeers )
+tr_torrentSetMaxUnchokedPeers( tr_torrent  * tor,
+                               uint8_t       maxUnchokedPeers )
 {
     tor->maxUnchokedPeers = maxUnchokedPeers;
 }
 
-uint16_t tr_torrentGetPeerLimit( const tr_torrent  * tor )
+uint16_t
+tr_torrentGetMaxConnectedPeers( const tr_torrent  * tor )
 {
     return tor->maxConnectedPeers;
 }
 
-uint8_t tr_torrentGetPeerUnchokedLimit( const tr_torrent  * tor )
+uint8_t
+tr_torrentGetMaxUnchokedPeers( const tr_torrent  * tor )
 {
     return tor->maxUnchokedPeers;

trunk/libtransmission/transmission.h

@@ -279 +279 @@
 **/
 
-void tr_torrentSetPeerLimit( tr_torrent  * tor,
-                              uint16_t      maxConnectedPeers);
-
-void tr_torrentSetPeerUnchokedLimit( tr_torrent  * tor,
-                              uint8_t       maxUnchokedPeers );
-
-uint16_t tr_torrentGetPeerLimit( const tr_torrent  * tor );
-
-uint8_t tr_torrentGetPeerUnchokedLimit( const tr_torrent  * tor );
+void tr_torrentSetMaxConnectedPeers( tr_torrent  * tor,
+                                     uint16_t      maxConnectedPeers);
+
+uint16_t tr_torrentGetMaxConnectedPeers( const tr_torrent  * tor );
+
+void tr_torrentSetMaxUnchokedPeers( tr_torrent  * tor,
+                                    uint8_t       maxUnchokedPeers );
+
+uint8_t tr_torrentGetMaxUnchokedPeers( const tr_torrent  * tor );
 
 void tr_setGlobalPeerLimit( tr_handle * handle,