Changeset 2255

Timestamp:

Jun 30, 2007, 9:53:45 PM (16 years ago)

Author:

livings124

Message:

get rid of a warning

Location:

trunk/macosx

Files:

• Torrent.h (modified) (2 diffs)
• Torrent.m (modified) (2 diffs)

trunk/macosx/Torrent.h

@@ -34 +34 @@
 @interface Torrent : NSObject
 {
-    tr_handle_t  * fLib;
+    tr_handle_t * fLib;
     tr_torrent_t * fHandle;
-    tr_info_t    * fInfo;
-    tr_stat_t    * fStat;
+    const tr_info_t * fInfo;
+    tr_stat_t * fStat;
     
     int fID;
@@ -223 +223 @@
 
 - (int) torrentID;
-- (tr_info_t *) torrentInfo;
+- (const tr_info_t *) torrentInfo;
 - (tr_stat_t *) torrentStat;
 

trunk/macosx/Torrent.m

@@ -819 +819 @@
         return YES;
     
-    NSString * volumeName = [[[NSFileManager defaultManager] componentsToDisplayForPath: [self downloadFolder]]
-                                                                                                objectAtIndex: 0];
-    NSDictionary * fsAttributes = [[NSFileManager defaultManager] fileSystemAttributesAtPath: [self downloadFolder]];
-    uint64_t remainingSpace = [[fsAttributes objectForKey: NSFileSystemFreeSize] unsignedLongLongValue],
-            torrentRemaining = fStat->left;
-    
-    if (volumeName && remainingSpace <= torrentRemaining)
-    {
-        NSAlert * alert = [[NSAlert alloc] init];
-        [alert setMessageText: [NSString stringWithFormat:
-                                NSLocalizedString(@"Not enough remaining disk space to download \"%@\" completely.",
-                                    "Torrent file disk space alert -> title"), [self name]]];
-        [alert setInformativeText: [NSString stringWithFormat:
-                        NSLocalizedString(@"The transfer will be paused. Clear up space on \"%@\" to continue.",
-                                            "Torrent file disk space alert -> message"), volumeName]];
-        [alert addButtonWithTitle: NSLocalizedString(@"OK", "Torrent file disk space alert -> button")];
-        [alert addButtonWithTitle: NSLocalizedString(@"Download Anyway", "Torrent file disk space alert -> button")];
-        [alert addButtonWithTitle: NSLocalizedString(@"Always Download", "Torrent file disk space alert -> button")];
-        
-        int result = [alert runModal];
-        [alert release];
-        
-        if (result == NSAlertThirdButtonReturn)
-            [fDefaults setBool: NO forKey: @"WarningRemainingSpace"];
-        
-        return result != NSAlertFirstButtonReturn;
+    NSString * volumeName;
+    if ((volumeName = [[[NSFileManager defaultManager] componentsToDisplayForPath: [self downloadFolder]] objectAtIndex: 0]))
+    {
+        NSDictionary * fsAttributes = [[NSFileManager defaultManager] fileSystemAttributesAtPath: [self downloadFolder]];
+        uint64_t remainingSpace = [[fsAttributes objectForKey: NSFileSystemFreeSize] unsignedLongLongValue];
+        
+        if (remainingSpace <= fStat->left)
+        {
+            NSAlert * alert = [[NSAlert alloc] init];
+            [alert setMessageText: [NSString stringWithFormat:
+                                    NSLocalizedString(@"Not enough remaining disk space to download \"%@\" completely.",
+                                        "Torrent file disk space alert -> title"), [self name]]];
+            [alert setInformativeText: [NSString stringWithFormat:
+                            NSLocalizedString(@"The transfer will be paused. Clear up space on \"%@\" to continue.",
+                                                "Torrent file disk space alert -> message"), volumeName]];
+            [alert addButtonWithTitle: NSLocalizedString(@"OK", "Torrent file disk space alert -> button")];
+            [alert addButtonWithTitle: NSLocalizedString(@"Download Anyway", "Torrent file disk space alert -> button")];
+            [alert addButtonWithTitle: NSLocalizedString(@"Always Download", "Torrent file disk space alert -> button")];
+            
+            int result = [alert runModal];
+            [alert release];
+            
+            if (result == NSAlertThirdButtonReturn)
+                [fDefaults setBool: NO forKey: @"WarningRemainingSpace"];
+            
+            return result != NSAlertFirstButtonReturn;
+        }
     }
     return YES;
@@ -1444 +1445 @@
 }
 
-- (tr_info_t *) torrentInfo
+- (const tr_info_t *) torrentInfo
 {
     return fInfo;