Changeset 9297

Timestamp:

Oct 11, 2009, 5:17:29 PM (13 years ago)

Author:

livings124

Message:

add some more switch statement asserts

Location:

trunk/macosx

Files:

• InfoWindowController.m (modified) (8 diffs)
• MessageWindowController.m (modified) (1 diff)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (1 diff)

trunk/macosx/InfoWindowController.m

@@ -768 +768 @@
             break;
         default:
+            NSAssert1(NO, @"Unknown info tab selected: %d", fCurrentTabTag);
             return;
     }
@@ -1012 +1013 @@
             "Inspector -> Peers tab -> table row tooltip"), portString]];
         
-        switch ([[peer objectForKey: @"From"] intValue])
+        const NSInteger peerFrom = [[peer objectForKey: @"From"] integerValue];
+        switch (peerFrom)
         {
             case TR_PEER_FROM_TRACKER:
@@ -1029 +1031 @@
                 [components addObject: NSLocalizedString(@"From: distributed hash table", "Inspector -> Peers tab -> table row tooltip")];
                 break;
+            default:
+                NSAssert1(NO, @"Peer from unknown source: %d", peerFrom);
         }
         
@@ -1105 +1109 @@
 }
 
-#warning what?!
+#warning is editing trackers needed?
 /*- (BOOL) tableView: (NSTableView *) tableView shouldEditTableColumn: (NSTableColumn *) tableColumn row: (NSInteger) row
 {
@@ -1274 +1278 @@
             break;
         default:
+            NSAssert1(NO, @"Unknown option selected in ratio popup: %d", [sender indexOfSelectedItem]);
             return;
     }
@@ -1311 +1316 @@
             break;
         default:
+            NSAssert1(NO, @"Unknown option selected in priority popup: %d", [sender indexOfSelectedItem]);
             return;
     }
@@ -1442 +1448 @@
     Torrent * torrent = [fTorrents objectAtIndex: 0];
     
-    //get update tracker stats
+    //get updated tracker stats
     if ([fTrackerTable editedRow] == -1)
     {
@@ -1555 +1561 @@
             return fOptionsView;
         default:
+            NSAssert1(NO, @"Unknown tab view for tag: %d", tag);
             return nil;
     }

trunk/macosx/MessageWindowController.m

@@ -139 +139 @@
 - (void) updateLog: (NSTimer *) timer
 {
-    static NSUInteger currentIndex = 0;
-    
     tr_msg_list * messages;
     if ((messages = tr_getQueuedMessages()) == NULL)
         return;
     
+    static NSUInteger currentIndex = 0;
     for (tr_msg_list * currentMessage = messages; currentMessage != NULL; currentMessage = currentMessage->next)
     {

trunk/macosx/Torrent.h

@@ -131 +131 @@
 
 - (NSMutableArray *) allTrackerStats;
-- (NSMutableArray *) allTrackersFlat; //used by GroupRules
+- (NSArray *) allTrackersFlat; //used by GroupRules
 - (BOOL) addTrackerToNewTier: (NSString *) tracker;
 - (void) removeTrackersWithAnnounceAddresses: (NSSet *) trackers;

trunk/macosx/Torrent.m

@@ -696 +696 @@
 }
 
-- (NSMutableArray *) allTrackersFlat
+- (NSArray *) allTrackersFlat
 {
     NSMutableArray * allTrackers = [NSMutableArray arrayWithCapacity: fInfo->trackerCount];