minor fixes

Author: rfm

Source/GSStream.m

@@ -321,35 +321,34 @@ - (NSStreamStatus) streamStatus
 - (NSString*) _stringFromEvents
 {
   NSMutableString	*s = [NSMutableString stringWithCapacity: 100];
-  BOOL			bits = 0;
 
   if (0 == _events)
     {
       return @"None";
     }
   if (_events & NSStreamEventOpenCompleted)
     {
-      if (bits++ > 0) [s appendString: @"|"];
+      if ([s length] > 0) [s appendString: @"|"];
       [s appendString: @"OpenCompleted"];
     }
   if (_events & NSStreamEventHasBytesAvailable)
     {
-      if (bits++ > 0) [s appendString: @"|"];
+      if ([s length] > 0) [s appendString: @"|"];
       [s appendString: @"HasBytesAvailable"];
     }
   if (_events & NSStreamEventHasSpaceAvailable)
     {
-      if (bits++ > 0) [s appendString: @"|"];
+      if ([s length] > 0) [s appendString: @"|"];
       [s appendString: @"HasSpaceAvailable"];
     }
   if (_events & NSStreamEventErrorOccurred)
     {
-      if (bits++ > 0) [s appendString: @"|"];
+      if ([s length] > 0) [s appendString: @"|"];
       [s appendString: @"ErrorOccurred"];
     }
   if (_events & NSStreamEventEndEncountered)
     {
-      if (bits++ > 0) [s appendString: @"|"];
+      if ([s length] > 0) [s appendString: @"|"];
       [s appendString: @"EndEncountered"];
     }
   return s;

Source/NSString.m

@@ -4964,7 +4964,7 @@ - (NSString*) stringByExpandingTildeInPath
 {
   NSString	*homedir;
   NSRange	firstSlashRange;
-  unsigned	length;
+  NSUInteger	length;
 
   if ((length = [self length]) == 0)
     {
@@ -5004,8 +5004,8 @@ - (NSString*) stringByExpandingTildeInPath
   if (firstSlashRange.location != 1)
     {
       /* It is of the form `~username/blah/...' or '~username' */
-      int	userNameLen;
-      NSString	*uname;
+      NSUInteger	userNameLen;
+      NSString		*uname;
 
       if (firstSlashRange.length != 0)
 	{
@@ -5014,8 +5014,8 @@ - (NSString*) stringByExpandingTildeInPath
       else
 	{
 	  /* It is actually of the form `~username' */
-	  userNameLen = [self length] - 1;
-	  firstSlashRange.location = [self length];
+	  userNameLen = length - 1;
+	  firstSlashRange.location = length;
 	}
       uname = [self substringWithRange: ((NSRange){1, userNameLen})];
       homedir = NSHomeDirectoryForUser(uname);