Author: rmottola
Date: Thu Mar 24 18:29:32 2016
New Revision: 39601
URL: http://svn.gna.org/viewcvs/gnustep?rev=39601&view=rev
Log:
Clean up code and make it more robust
Modified:
apps/gworkspace/trunk/ChangeLog
apps/gworkspace/trunk/Tools/searchtool/searchtool.m
Modified: apps/gworkspace/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/ChangeLog?rev=39601&r1=39600&r2=39601&view=diff
==============================================================================
--- apps/gworkspace/trunk/ChangeLog (original)
+++ apps/gworkspace/trunk/ChangeLog Thu Mar 24 18:29:32 2016
@@ -10,6 +10,9 @@
* GWorkspace/Finder/Modules/FModuleSize/FModuleSize.m
* GWorkspace/Finder/Modules/FinderModulesProtocol.h
use NSInteger and NSComparisonResult instead of int.
+
+ * Tools/searchtool/searchtool.m
+ Clean up code and make it more robust.
2016-03-23 Riccardo Mottola <[email protected]>
Modified: apps/gworkspace/trunk/Tools/searchtool/searchtool.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Tools/searchtool/searchtool.m?rev=39601&r1=39600&r2=39601&view=diff
==============================================================================
--- apps/gworkspace/trunk/Tools/searchtool/searchtool.m (original)
+++ apps/gworkspace/trunk/Tools/searchtool/searchtool.m Thu Mar 24 18:29:32 2016
@@ -150,8 +150,8 @@
CREATE_AUTORELEASE_POOL(arp);
NSDictionary *srcdict = [NSUnarchiver unarchiveObjectWithData: srcinfo];
NSArray *paths = [srcdict objectForKey: @"paths"];
- id recursion = [srcdict objectForKey: @"recursion"];
- BOOL norecursion = ((recursion != nil) && ([recursion boolValue] == NO));
+ id recursionObj = [srcdict objectForKey: @"recursion"];
+ BOOL recursion;
NSDictionary *criteria = [srcdict objectForKey: @"criteria"];
NSArray *classNames = [criteria allKeys];
NSMutableArray *modules = [NSMutableArray array];
@@ -161,6 +161,10 @@
NSEnumerator *enumerator;
NSUInteger i;
+ recursion = NO;
+ if (recursionObj)
+ recursion = [recursionObj boolValue];
+
bundlesPaths = [NSMutableArray array];
enumerator = [NSSearchPathForDirectoriesInDomains
(NSLibraryDirectory, NSAllDomainsMask, YES) objectEnumerator];
@@ -239,7 +243,7 @@
break;
}
- if (([attrs fileType] == NSFileTypeDirectory) && norecursion) {
+ if (([attrs fileType] == NSFileTypeDirectory) && !recursion) {
[enumerator skipDescendents];
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
