From 3d1cf6ba0dfee01aef51e15306b2d8e788adc53c Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Tue, 17 Feb 2009 04:00:53 +0000
Subject: [PATCH] assorted trivial cleanup

---
 libtransmission/peer-mgr.c | 6 +++---
 libtransmission/torrent.c  | 6 +++---
 macosx/BadgeView.m         | 1 -
 macosx/Torrent.m           | 8 ++++----
 macosx/TorrentTableView.m  | 4 ++--
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index 453fc971a..f467e4d19 100644
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -992,9 +992,9 @@ peerCallbackFunc( void * vpeer, void * vevent, void * vt )
 
             /* if we're seeding and we've reached our seed ratio limit, stop the torrent */
             if( tr_torrentIsSeed( tor ) && tr_torrentGetSeedRatio( tor, &seedRatio ) ) {
-                double up = (double)tor->uploadedCur + (double)tor->uploadedPrev;
-                double down = (double)tor->downloadedCur + (double)tor->downloadedPrev;
-                double ratio = tr_getRatio( up, down );
+                const double up = tor->uploadedCur + tor->uploadedPrev;
+                const double down = tor->downloadedCur + tor->downloadedPrev;
+                const double ratio = tr_getRatio( up, down );
                 if( ratio >= seedRatio ) {
                     tr_torrentStop( tor );
                     
diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index c7d6ac642..7ee2c0bf1 100644
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -228,9 +228,9 @@ tr_torrentGetSeedRatio( const tr_torrent * tor, double * ratio )
             break;
 
         case TR_RATIOLIMIT_GLOBAL:
-            if(( isLimited = tr_sessionIsRatioLimited( tor->session )))
-                if( ratio )
-                    *ratio = tr_sessionGetRatioLimit( tor->session );
+            isLimited = tr_sessionIsRatioLimited( tor->session );
+            if( isLimited && ratio )
+                *ratio = tr_sessionGetRatioLimit( tor->session );
             break;
 
         case TR_RATIOLIMIT_UNLIMITED:
diff --git a/macosx/BadgeView.m b/macosx/BadgeView.m
index 5c9c31be3..4c3219266 100644
--- a/macosx/BadgeView.m
+++ b/macosx/BadgeView.m
@@ -101,7 +101,6 @@
 
 @implementation BadgeView (Private)
 
-//dock icon must have locked focus
 - (void) badge: (NSImage *) badge string: (NSString *) string atHeight: (CGFloat) height adjustForQuit: (BOOL) quit
 {
     if (!fAttributes)
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 612376c41..a0f1298d5 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -1484,7 +1484,7 @@ int trashDataFile(const char * filename)
         if (![self canChangeDownloadCheckForFile: index])
             continue;
         
-        NSInteger priority = tr_torrentGetFilePriority(fHandle, index);
+        const NSInteger priority = tr_torrentGetFilePriority(fHandle, index);
         if (priority == TR_PRI_LOW)
         {
             if (low)
@@ -1513,19 +1513,19 @@ int trashDataFile(const char * filename)
 
 - (NSDate *) dateAdded
 {
-    time_t date = fStat->addedDate;
+    const time_t date = fStat->addedDate;
     return [NSDate dateWithTimeIntervalSince1970: date];
 }
 
 - (NSDate *) dateCompleted
 {
-    time_t date = fStat->doneDate;
+    const time_t date = fStat->doneDate;
     return date != 0 ? [NSDate dateWithTimeIntervalSince1970: date] : nil;
 }
 
 - (NSDate *) dateActivity
 {
-    time_t date = fStat->activityDate;
+    const time_t date = fStat->activityDate;
     return date != 0 ? [NSDate dateWithTimeIntervalSince1970: date] : nil;
 }
 
diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index 109f38dc3..1c132cbce 100644
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -722,7 +722,7 @@
 
 - (void) setQuickLimitMode: (id) sender
 {
-    NSInteger mode;
+    tr_speedlimit mode;
     switch ([sender tag])
     {
         case ACTION_MENU_UNLIMITED_TAG:
@@ -745,7 +745,7 @@
 
 - (void) setQuickLimit: (id) sender
 {
-    BOOL upload = [sender menu] == fUploadMenu;
+    const BOOL upload = [sender menu] == fUploadMenu;
     [fMenuTorrent setSpeedMode: TR_SPEEDLIMIT_SINGLE upload: upload];
     [fMenuTorrent setSpeedLimit: [[sender representedObject] intValue] upload: upload];