From 5a65c79ae3b6703ee476057c6ac1b440a0e471a7 Mon Sep 17 00:00:00 2001
From: richard <richard@72102866-910b-0410-8b05-ffd578937521>
Date: Wed, 15 Nov 2000 11:40:00 +0000
Subject: [PATCH] Minor tidyup

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@8120 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog              |  5 +++
 Source/NSBundle.m      | 80 ++++++++++++++++++++++++++----------------
 Source/NSFileManager.m |  1 -
 3 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b35d94dbe..a987da30b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-15  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSBundle.m: Minor tidying to avoid compiler warnings.
+	* Source/NSFileManager.m: ditto
+
 Tue Nov 14 23:44:14 2000  Adam Fedor  <fedor@yogi.doc.com>
 
 	* Source/GSString.m: Add limits.h (for Solaris)
diff --git a/Source/NSBundle.m b/Source/NSBundle.m
index 636966485..b76aaa22e 100644
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@@ -316,27 +316,35 @@ static NSBundle *lastFrameworkBundle = nil;
 void
 _bundle_load_callback(Class theClass, Category *theCategory)
 {
-  NSBundle	  *bundle = nil;
-  NSString        *className;
-  NSString        *path, *bundlePath = nil, *lastComponent;
-  NSString        *libName, *frameworkVersion = nil;
-  BOOL             isFramework = NO;
+  NSBundle	*bundle = nil;
+  NSString	*className;
+#if	LINKER_GETSYMBOL
+  NSString	*path;
+  NSString	*bundlePath = nil;
+  NSString	*lastComponent;
+  NSString	*libName;
+  NSString	*frameworkVersion = nil;
+  BOOL		isFramework = NO;
+#endif
 
   NSCAssert(_loadingBundle, NSInternalInconsistencyException);
 
-  if (theClass)
-    className = NSStringFromClass(theClass);
+  if (theClass != 0)
+    {
+      className = NSStringFromClass(theClass);
+    }
   else
-    className = [NSString stringWithCString: theCategory->class_name];
+    {
+      className = [NSString stringWithCString: theCategory->class_name];
+    }
 
-#if !LINKER_GETSYMBOL
-  if ([NSBundle _addFrameworkFromClass: theClass] == YES)
-    return;
-#else
+#if	LINKER_GETSYMBOL
   path = objc_get_symbol_path(theClass, theCategory);
 
   if (lastSymbolPath && [lastSymbolPath isEqual: path] == YES)
-    isFramework = YES;
+    {
+      isFramework = YES;
+    }
   else
     {
       NSString *s;
@@ -378,10 +386,14 @@ _bundle_load_callback(Class theClass, Category *theCategory)
 	      if (len > 3)
 		{
 		  for (i = 3; i < len; i++)
-		    if (cString[i] == '.')
-		      break;
+		    {
+		      if (cString[i] == '.')
+			{
+			  break;
+			}
+		    }
 
-		  if (i-3)
+		  if (i > 3)
 		    {
 		      NSString *name;
 
@@ -424,28 +436,29 @@ _bundle_load_callback(Class theClass, Category *theCategory)
 
       if (isFramework == YES)
 	{
-	  if (_bundles) 
-	    bundle = (NSBundle *)NSMapGet(_bundles, bundlePath);
-
-	  if (!bundle && _releasedBundles)
+	  if (_bundles != nil) 
+	    {
+	      bundle = (NSBundle *)NSMapGet(_bundles, bundlePath);
+	    }
+	  if (bundle != nil && _releasedBundles != 0)
 	    {
 	      bundle = (NSBundle *)NSMapGet(_releasedBundles, bundlePath);
 
-	      if (bundle)
+	      if (bundle != nil)
 		{
 		  NSMapInsert(_bundles, bundlePath, bundle);
 		  NSMapRemove(_releasedBundles, bundlePath);
 		}
 	    }
 
-	  if (!bundle)
+	  if (bundle != nil)
 	    {
 	      bundle = [NSBundle bundleWithPath: bundlePath];
 	      bundle->_bundleType = NSBUNDLE_FRAMEWORK;
 	      bundle->_codeLoaded = YES;
 	      bundle->_frameworkVersion = RETAIN(frameworkVersion);
-	      bundle->_bundleClasses = RETAIN([NSMutableArray
-						arrayWithCapacity: 2]);
+	      bundle->_bundleClasses
+		= RETAIN([NSMutableArray arrayWithCapacity: 2]);
 	    }
 
 	  ASSIGN(lastFrameworkBundle, bundle);
@@ -456,24 +469,31 @@ _bundle_load_callback(Class theClass, Category *theCategory)
     {
       bundle = lastFrameworkBundle;
 
-      if (lastFrameworkName)
+      if (lastFrameworkName != nil)
 	{
 	  if ([className isEqual: lastFrameworkName] == YES)
 	    {
 	      bundle->_frameworkVersion = RETAIN([theClass frameworkVersion]);
-
 	      DESTROY(lastFrameworkName);
 	    }
 	}
     }
   else
+    {
+      bundle = _loadingBundle;
+    }
+#else
+  if ([NSBundle _addFrameworkFromClass: theClass] == YES)
+    return;
+  bundle = _loadingBundle;
 #endif
-    bundle = _loadingBundle;
 
   /* Don't store categories */
-  if (!theCategory)
-    [(NSMutableArray *)[bundle _bundleClasses] addObject: [NSValue
-      valueWithNonretainedObject: (id)theClass]];
+  if (theCategory == 0)
+    {
+      [(NSMutableArray *)[bundle _bundleClasses] addObject:
+	[NSValue valueWithNonretainedObject: (id)theClass]];
+    }
 }
 
 
diff --git a/Source/NSFileManager.m b/Source/NSFileManager.m
index 8737cbe8f..7ec202e15 100644
--- a/Source/NSFileManager.m
+++ b/Source/NSFileManager.m
@@ -1129,7 +1129,6 @@ static NSFileManager* defaultManager = nil;
   NSMutableArray	*content;
   IMP			nxtImp;
   IMP			addImp;
-  NSDictionary		*attr;
   BOOL			is_dir;
 
   /*