small efficiency fixes from last caching change.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34478 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-01-10 09:56:57 +00:00
parent fb47a4fcb7
commit bf2386269b

View file

@ -1889,10 +1889,9 @@ IF_NO_GC(
subPath: subPath localization: nil] objectEnumerator];
while ((path = [pathlist nextObject]) != nil)
{
id paths = bundle_directory_readable(path);
NSArray *paths = bundle_directory_readable(path);
if ((id)[NSNull null] != paths
&& YES == [(NSArray*)paths containsObject: file])
if (YES == [paths containsObject: file])
{
path = [path stringByAppendingPathComponent: file];
if (YES == [mgr isReadableFileAtPath: path])
@ -2013,7 +2012,6 @@ IF_NO_GC(
NSString *path;
NSMutableArray *resources;
NSEnumerator *pathlist;
NSFileManager *mgr = manager();
pathlist = [[NSBundle _bundleResourcePathsWithRootPath: bundlePath
subPath: subPath localization: localization] objectEnumerator];
@ -2023,9 +2021,9 @@ IF_NO_GC(
while ((path = [pathlist nextObject]))
{
NSEnumerator *filelist;
NSString *match;
NSString *match;
filelist = [[mgr directoryContentsAtPath: path] objectEnumerator];
filelist = [bundle_directory_readable(path) objectEnumerator];
while ((match = [filelist nextObject]))
{
if (allfiles || [extension isEqual: [match pathExtension]])