[kismac] [binaervarianz] r204 - in trunk/Sources: Core Views

Author: gkruse
Date: 2006-10-13 05:19:45 +0200 (Fri, 13 Oct 2006)
New Revision: 204

Modified:
   trunk/Sources/Core/KismetXMLImporter.m
   trunk/Sources/Core/WaveContainer.h
   trunk/Sources/Core/WaveContainer.m
   trunk/Sources/Views/PointView.m
Log:
Some changes fixing various memory / object leaks

Modified: trunk/Sources/Core/KismetXMLImporter.m
===================================================================
--- trunk/Sources/Core/KismetXMLImporter.m      2006-10-08 20:33:48 UTC (rev 
203)
+++ trunk/Sources/Core/KismetXMLImporter.m      2006-10-13 03:19:45 UTC (rev 
204)
@@ -13,7 +13,6 @@
 
 -(id) init {
     [super init];
-    importedNets = [[NSMutableArray alloc] init];
     return self;
 }
 
@@ -111,16 +110,17 @@
         [currentNet setValue: currentStringValue forKey:@"elev"];
     }
     else if([elementName isEqualToString:@"wireless-network"]){
-            //NSLog(@"End of Net Found");
+        //NSLog(@"End of Net Found");
         
-            WaveNet* net = [[WaveNet alloc] initWithDataDictionary: 
currentNet];
-            currentNet = NULL;
-            if (net) {
-                [importedNets addObject:net];
-                [net release];
-            }else {
-                NSLog(@"Invalid Net!");
-            }
+        WaveNet* net = [[WaveNet alloc] initWithDataDictionary: currentNet];
+        [currentNet release];
+        currentNet = nil;
+        if (net) {
+            [importedNets addObject:net];
+        }else {
+            NSLog(@"Invalid Net!");
+        }
+        [net release];
 
     }
 
@@ -131,6 +131,7 @@
 
 - (NSDictionary*)performKismetImport: (NSString *)filename 
withContainer:(WaveContainer*)container
 {
+    importedNets = [[NSMutableArray alloc] init];
     NSData * theData = [[NSData alloc] initWithContentsOfFile: filename];
        NSXMLParser * theParser = [[NSXMLParser alloc] initWithData: theData];
        [theParser setDelegate: self];
@@ -144,6 +145,13 @@
         return nil;
        // hasValidData = NO;
     }
+    [importedNets release];
+    [theData release];
+    [theParser release];
+    
+    importedNets = nil;
+    theData = nil;
+    theParser = nil;
     return currentNet;
 }
 

Modified: trunk/Sources/Core/WaveContainer.h
===================================================================
--- trunk/Sources/Core/WaveContainer.h  2006-10-08 20:33:48 UTC (rev 203)
+++ trunk/Sources/Core/WaveContainer.h  2006-10-13 03:19:45 UTC (rev 204)
@@ -26,7 +26,7 @@
 #import <Foundation/Foundation.h>
 #import "WaveNet.h"
 
-#define MAXNETS 10000
+#define MAXNETS 1000000
 #define MAXCACHE 20
 #define MAXFILTER 100
 #define MAXCHANGED 100

Modified: trunk/Sources/Core/WaveContainer.m
===================================================================
--- trunk/Sources/Core/WaveContainer.m  2006-10-08 20:33:48 UTC (rev 203)
+++ trunk/Sources/Core/WaveContainer.m  2006-10-13 03:19:45 UTC (rev 204)
@@ -413,7 +413,7 @@
             [n setNetID:++maxID];
         } else [net mergeWithNet:n];
     }
-      
+
     return YES;
 }
 

Modified: trunk/Sources/Views/PointView.m
===================================================================
--- trunk/Sources/Views/PointView.m     2006-10-08 20:33:48 UTC (rev 203)
+++ trunk/Sources/Views/PointView.m     2006-10-13 03:19:45 UTC (rev 204)
@@ -183,7 +183,9 @@
                 [self setImage:_currImg[scale]];
             }
             [[WaveHelper mapView] setNeedsDisplayInMoveRect:_frame];
-            [NSThread sleepUntilDate:[NSDate 
dateWithTimeIntervalSinceNow:0.1]];
+            NSDate * test = [NSDate dateWithTimeIntervalSinceNow:0.1];
+            [NSThread sleepUntilDate: test];
+            [test release];
         }
         [self release];
         [_animLock unlock];

Other related posts: