mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 00:41:02 +00:00
Tidyups to avoid compiler warnings.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@20863 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
13ae894cb9
commit
f92b8f24ef
7 changed files with 25 additions and 23 deletions
|
@ -1301,8 +1301,8 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
|
|||
}
|
||||
if ([writeInfo count] > 0)
|
||||
{
|
||||
id info = [writeInfo objectAtIndex: 0];
|
||||
id operation = [info objectForKey: NotificationKey];
|
||||
NSDictionary *info = [writeInfo objectAtIndex: 0];
|
||||
id operation = [info objectForKey: NotificationKey];
|
||||
|
||||
if (operation == GSFileHandleConnectCompletionNotification)
|
||||
{
|
||||
|
@ -1350,8 +1350,8 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
|
|||
}
|
||||
if ([writeInfo count] > 0)
|
||||
{
|
||||
id info = [writeInfo objectAtIndex: 0];
|
||||
id operation = [info objectForKey: NotificationKey];
|
||||
NSDictionary *info = [writeInfo objectAtIndex: 0];
|
||||
id operation = [info objectForKey: NotificationKey];
|
||||
|
||||
if (operation != GSFileHandleWriteCompletionNotification)
|
||||
{
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include "config.h"
|
||||
#include "GNUstepBase/preface.h"
|
||||
#include "GNUstepBase/DistributedObjects.h"
|
||||
#include "GNUstepBase/GSObjCRuntime.h"
|
||||
#include "Foundation/NSDebug.h"
|
||||
#include "Foundation/NSLock.h"
|
||||
#include "Foundation/NSPort.h"
|
||||
|
@ -148,7 +149,7 @@ enum proxyLocation
|
|||
|
||||
+ (void) initialize
|
||||
{
|
||||
if (self == [GSDistantObjectPlaceHolder class])
|
||||
if (self == GSClassFromName("GSDistantObjectPlaceHolder"))
|
||||
{
|
||||
distantObjectClass = [NSDistantObject class];
|
||||
}
|
||||
|
@ -392,7 +393,7 @@ enum proxyLocation
|
|||
{
|
||||
if (self == [NSDistantObject class])
|
||||
{
|
||||
placeHolder = [GSDistantObjectPlaceHolder class];
|
||||
placeHolder = GSClassFromName("GSDistantObjectPlaceHolder");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1937,7 +1937,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
|
|||
{
|
||||
for (i = 0; i < numKeys; i++)
|
||||
{
|
||||
plists[i] = [obj objectForKey: keys[i]];
|
||||
plists[i] = [(NSDictionary*)obj objectForKey: keys[i]];
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
@ -1137,7 +1137,7 @@ quotedFromString(NSString *aString)
|
|||
}
|
||||
[data appendBytes: &terminator length: 2]; // end of environment
|
||||
RELEASE(pool);
|
||||
envp = [data bytes];
|
||||
envp = [data mutableBytes];
|
||||
}
|
||||
|
||||
memset (&start_info, 0, sizeof(start_info));
|
||||
|
|
|
@ -674,9 +674,9 @@ static NSMapTable *absolutes = 0;
|
|||
return offset;
|
||||
}
|
||||
|
||||
- (NSTimeZone*) timeZoneDetailTimeZone
|
||||
- (NSArray*) timeZoneDetailArray
|
||||
{
|
||||
return [NSTimeZone arrayWithObject: detail];
|
||||
return [NSArray arrayWithObject: detail];
|
||||
}
|
||||
|
||||
- (NSTimeZoneDetail*) timeZoneDetailForDate: (NSDate*)date
|
||||
|
@ -2007,15 +2007,15 @@ int dayOfCommonEra(NSTimeInterval when);
|
|||
|
||||
- (NSArray*) timeZoneDetailArray
|
||||
{
|
||||
return [NSArray arrayWithObjects:
|
||||
[[[GSTimeZoneDetail alloc] initWithTimeZone:self
|
||||
withAbbrev:timeZoneNameAbbr
|
||||
withOffset:-Bias*60 - StandardBias*60
|
||||
withDST:NO] autorelease],
|
||||
[[[GSTimeZoneDetail alloc] initWithTimeZone:self
|
||||
withAbbrev:daylightZoneNameAbbr
|
||||
withOffset:-Bias*60 - DaylightBias*60
|
||||
withDST:YES] autorelease], 0];
|
||||
return [NSArray arrayWithObjects:
|
||||
[[[GSTimeZoneDetail alloc] initWithTimeZone:self
|
||||
withAbbrev:timeZoneNameAbbr
|
||||
withOffset:-Bias*60 - StandardBias*60
|
||||
withDST:NO] autorelease],
|
||||
[[[GSTimeZoneDetail alloc] initWithTimeZone:self
|
||||
withAbbrev:daylightZoneNameAbbr
|
||||
withOffset:-Bias*60 - DaylightBias*60
|
||||
withDST:YES] autorelease], 0];
|
||||
}
|
||||
|
||||
- (NSTimeZoneDetail*) timeZoneDetailForDate: (NSDate*)aDate
|
||||
|
|
|
@ -1061,7 +1061,7 @@ static NSString *pathForUser(NSString *user)
|
|||
|
||||
while ((dN = (*nImp)(enumerator, nextObjectSel)) != nil)
|
||||
{
|
||||
id dict;
|
||||
NSDictionary *dict;
|
||||
|
||||
dict = (*pImp)(_persDomains, objectForKeySel, dN);
|
||||
if (dict != nil && (object = [dict objectForKey: defaultName]))
|
||||
|
@ -1084,7 +1084,8 @@ static NSString *pathForUser(NSString *user)
|
|||
id obj;
|
||||
|
||||
[_lock lock];
|
||||
obj = [[_persDomains objectForKey: processName] objectForKey: defaultName];
|
||||
obj = [_persDomains objectForKey: processName];
|
||||
obj = [(NSDictionary*)obj objectForKey: defaultName];
|
||||
if (obj != nil)
|
||||
{
|
||||
NSMutableDictionary *dict;
|
||||
|
@ -1182,7 +1183,7 @@ static BOOL isPlistObject(id o)
|
|||
{
|
||||
return NO;
|
||||
}
|
||||
tmp = [o objectForKey: tmp];
|
||||
tmp = [(NSDictionary*)o objectForKey: tmp];
|
||||
if (isPlistObject(tmp) == NO)
|
||||
{
|
||||
return NO;
|
||||
|
|
|
@ -45,7 +45,7 @@ Win32OpenRegistry(DWORD hive, const char *key)
|
|||
{
|
||||
HKEY regkey;
|
||||
|
||||
if (ERROR_SUCCESS == RegOpenKeyEx(hive, key, 0, KEY_READ, ®key))
|
||||
if (ERROR_SUCCESS == RegOpenKeyEx((HKEY)hive, key, 0, KEY_READ, ®key))
|
||||
{
|
||||
return regkey;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue