[kismac] [binaervarianz] r106 - in KisMACng: . Sources/Core Sources/Driver/USBIntersilJack Sources/Preferences Sources/Preferences/PreferencePanes Sources/ScriptingCore Sources/Support

  • From: svn@xxxxxxxxxxxxxxxx
  • To: kismac@xxxxxxxxxxxxx
  • Date: Wed, 15 Mar 2006 08:53:29 +0100

Author: gkruse
Date: 2006-03-15 08:53:29 +0100 (Wed, 15 Mar 2006)
New Revision: 106

Modified:
   KisMACng/CHANGES
   KisMACng/Sources/Core/WaveContainer.m
   KisMACng/Sources/Core/WaveHelper.m
   KisMACng/Sources/Core/WaveNet.mm
   KisMACng/Sources/Driver/USBIntersilJack/USBIntersil.mm
   KisMACng/Sources/Preferences/PreferencePanes/PrefsGPS.m
   KisMACng/Sources/Preferences/PrefsController.m
   KisMACng/Sources/ScriptingCore/ScriptingEngine.m
   KisMACng/Sources/Support/MapDownload.m
Log:
R106: - Fixed some silly warnings as described in #61 note, this is not the 
patch from 61 because it was incorrect



Modified: KisMACng/CHANGES
===================================================================
--- KisMACng/CHANGES    2006-03-14 20:56:49 UTC (rev 105)
+++ KisMACng/CHANGES    2006-03-15 07:53:29 UTC (rev 106)
@@ -1,3 +1,5 @@
+R106: - Fixed some silly warnings as described in #61 note, this is not the 
patch from 61 because it was incorrect
+
 R102: - improved permanent airport extreme enabling & installing (even more)
          - including removal
          - fixed serveral small bugs

Modified: KisMACng/Sources/Core/WaveContainer.m
===================================================================
--- KisMACng/Sources/Core/WaveContainer.m       2006-03-14 20:56:49 UTC (rev 
105)
+++ KisMACng/Sources/Core/WaveContainer.m       2006-03-15 07:53:29 UTC (rev 
106)
@@ -301,7 +301,7 @@
     WaveNet *net;
         
     e = [data objectEnumerator];
-    while (n = [e nextObject]) {
+    while ((n = [e nextObject])) {
         if (![n isMemberOfClass:[WaveNet class]]) {
             NSLog(@"Could not load legacy data, because it is bad!");
             return NO;
@@ -359,7 +359,7 @@
         if ([_idList[i].net netID] > maxID) maxID = [_idList[i].net netID];
 
     e = [data objectEnumerator];
-    while (n = [e nextObject]) {
+    while ((n = [e nextObject])) {
         if (![n isMemberOfClass:[WaveNet class]]) {
             NSLog(@"Could not load legacy data, because it is bad!");
             return NO;

Modified: KisMACng/Sources/Core/WaveHelper.m
===================================================================
--- KisMACng/Sources/Core/WaveHelper.m  2006-03-14 20:56:49 UTC (rev 105)
+++ KisMACng/Sources/Core/WaveHelper.m  2006-03-15 07:53:29 UTC (rev 106)
@@ -200,7 +200,7 @@
     }
         
     if (IORegistryCreateIterator(masterPort, kIOServicePlane, 
kIORegistryIterateRecursively, &iterator) == KERN_SUCCESS) {
-        while (sdev = IOIteratorNext(iterator))
+        while ((sdev = IOIteratorNext(iterator)))
             if (IOObjectConformsTo(sdev, service)) {
                 IOObjectRelease (iterator);
                 return YES;
@@ -240,7 +240,7 @@
     
     e = [_waveDrivers keyEnumerator];
     
-    while (key = [e nextObject]) {
+    while ((key = [e nextObject])) {
         w = [_waveDrivers objectForKey:key];
         [_waveDrivers removeObjectForKey:key];
         [w unloadBackend];
@@ -344,7 +344,7 @@
     NSDictionary *d;
     
     e = [_waveDrivers keyEnumerator];
-    while (k = [e nextObject]) {
+    while ((k = [e nextObject])) {
         d = [[_waveDrivers objectForKey:k] configuration];
         if ([[d objectForKey:@"injectionDevice"] intValue]) return 
[_waveDrivers objectForKey:k];
     }

Modified: KisMACng/Sources/Core/WaveNet.mm
===================================================================
--- KisMACng/Sources/Core/WaveNet.mm    2006-03-14 20:56:49 UTC (rev 105)
+++ KisMACng/Sources/Core/WaveNet.mm    2006-03-15 07:53:29 UTC (rev 106)
@@ -401,7 +401,7 @@
                aClients = [[NSMutableDictionary 
dictionaryWithCapacity:[clients count]] retain];
                NSEnumerator *e = [clients keyEnumerator];
                
-               while (c = [e nextObject]) {
+               while ((c = [e nextObject])) {
                        [aClients setObject:[[[WaveClient alloc] 
initWithDataDictionary:[clients objectForKey:c]] autorelease] forKey:c];
                }
                aClientKeys = [[aClients allKeys] mutableCopy];
@@ -474,7 +474,7 @@
                pL = (struct signalCoords *)[coord mutableBytes];
                NSEnumerator *e = [_coordinates keyEnumerator];
                
-               while (vp = [e nextObject]) {
+               while ((vp = [e nextObject])) {
                        pL->strength = [[_coordinates objectForKey:vp] 
intValue];
                        pL->x = [vp getX];
                        pL->y = [vp getY];

Modified: KisMACng/Sources/Driver/USBIntersilJack/USBIntersil.mm
===================================================================
--- KisMACng/Sources/Driver/USBIntersilJack/USBIntersil.mm      2006-03-14 
20:56:49 UTC (rev 105)
+++ KisMACng/Sources/Driver/USBIntersilJack/USBIntersil.mm      2006-03-15 
07:53:29 UTC (rev 106)
@@ -760,7 +760,7 @@
    
     kr = (*dev)->CreateInterfaceIterator(dev, &request, &iterator);
     
-    while (usbInterface = IOIteratorNext(iterator)) {
+    while ((usbInterface = IOIteratorNext(iterator))) {
         //NSLog(@"Interface found.\n");
        
         kr = IOCreatePlugInInterfaceForService(usbInterface, 
kIOUSBInterfaceUserClientTypeID, kIOCFPlugInInterfaceID, &plugInInterface, 
&score);
@@ -901,7 +901,7 @@
     int                         i;
     
     
-    while (usbDevice = IOIteratorNext(iterator)) {
+    while ((usbDevice = IOIteratorNext(iterator))) {
         //NSLog(@"USB Device added.\n");
        
         kr = IOCreatePlugInInterfaceForService(usbDevice, 
kIOUSBDeviceUserClientTypeID, kIOCFPlugInInterfaceID, &plugInInterface, &score);

Modified: KisMACng/Sources/Preferences/PreferencePanes/PrefsGPS.m
===================================================================
--- KisMACng/Sources/Preferences/PreferencePanes/PrefsGPS.m     2006-03-14 
20:56:49 UTC (rev 105)
+++ KisMACng/Sources/Preferences/PreferencePanes/PrefsGPS.m     2006-03-15 
07:53:29 UTC (rev 106)
@@ -110,7 +110,7 @@
     {
         goto err; // REV/FIX: throw.
     }
-    while (sdev = IOIteratorNext (serialIterator))
+    while ((sdev = IOIteratorNext (serialIterator)))
     {
         NSString *tty = [self getRegistryString: sdev name:kIODialinDeviceKey];
         [a addObject: tty];

Modified: KisMACng/Sources/Preferences/PrefsController.m
===================================================================
--- KisMACng/Sources/Preferences/PrefsController.m      2006-03-14 20:56:49 UTC 
(rev 105)
+++ KisMACng/Sources/Preferences/PrefsController.m      2006-03-15 07:53:29 UTC 
(rev 106)
@@ -330,7 +330,7 @@
 
     if (![currentClient updateDictionary]) return;
     
-    while(key = [keyEnum nextObject]) {
+    while((key = [keyEnum nextObject])) {
         //[defaults setObject:[changesDict objectForKey:key] forKey:key];
     }
     

Modified: KisMACng/Sources/ScriptingCore/ScriptingEngine.m
===================================================================
--- KisMACng/Sources/ScriptingCore/ScriptingEngine.m    2006-03-14 20:56:49 UTC 
(rev 105)
+++ KisMACng/Sources/ScriptingCore/ScriptingEngine.m    2006-03-15 07:53:29 UTC 
(rev 106)
@@ -40,7 +40,7 @@
     NSAppleEventDescriptor *e = [NSAppleEventDescriptor 
appleEventWithEventClass:class eventID:event targetDescriptor:target 
returnID:kAutoGenerateReturnID transactionID:kAnyTransactionID];
     
     enu = [args keyEnumerator];
-    while (ae = [enu nextObject]) {
+    while ((ae = [enu nextObject])) {
         [e setDescriptor:[args objectForKey:ae] forKeyword:[ae intValue]];
     }
     

Modified: KisMACng/Sources/Support/MapDownload.m
===================================================================
--- KisMACng/Sources/Support/MapDownload.m      2006-03-14 20:56:49 UTC (rev 
105)
+++ KisMACng/Sources/Support/MapDownload.m      2006-03-15 07:53:29 UTC (rev 
106)
@@ -134,7 +134,7 @@
     while ((bytesread != -1) && ([s length] < 1100)) {
         if (bytesread==0) {
             errcount++;
-            if (errcount = 60) {
+            if (errcount == 60) {
                 error = NSLocalizedString(@"Got no response from expedia. 
Mapsize too big?", "Download Map Error");
                 goto err;
             }


Other related posts:

  • » [kismac] [binaervarianz] r106 - in KisMACng: . Sources/Core Sources/Driver/USBIntersilJack Sources/Preferences Sources/Preferences/PreferencePanes Sources/ScriptingCore Sources/Support