Fix typo and nil reference

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@15131 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-11-27 10:00:34 +00:00
parent f871365679
commit b9fb9b5bfa
3 changed files with 11 additions and 7 deletions

View file

@ -4,6 +4,7 @@
* EOAccess/EOModel.m: Appplied David Ayers patch for programmatic * EOAccess/EOModel.m: Appplied David Ayers patch for programmatic
model manipulation. Fixed typo. Use NSFileManager rather than model manipulation. Fixed typo. Use NSFileManager rather than
mkdir(). Tidied some use of autorelease for memory efficiency etc. mkdir(). Tidied some use of autorelease for memory efficiency etc.
* EOControl/EOGenericRecord.m: update to use GSFindInstanceVariable()
2002-11-26 Manuel Guesdon <mguesdon@orange-concept.com> 2002-11-26 Manuel Guesdon <mguesdon@orange-concept.com>

View file

@ -313,8 +313,11 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
NSAssert(name,@"No entityt name"); NSAssert(name,@"No entityt name");
entity = [_entitiesByName objectForKey: name]; entity = [_entitiesByName objectForKey: name];
entity = [self _verifyBuiltEntityObject: entity if (entiry != nil)
named: name]; {
entity = [self _verifyBuiltEntityObject: entity
named: name];
}
return entity; return entity;
} }
@ -1036,8 +1039,8 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
//OK //OK
[self loadAllModelObjects]; [self loadAllModelObjects];
[self willChange]; [self willChange];
ASSIGN(_path,path); ASSIGN(_path, path);
[self setName: [[path lastPathComponents] stringByDeletingPathExtension]]; [self setName: [[path lastPathComponent] stringByDeletingPathExtension]];
} }
- (EOEntity*) _entityForClass: (Class)aClass - (EOEntity*) _entityForClass: (Class)aClass

View file

@ -181,8 +181,8 @@ static const char _c_id[2] = { _C_ID, NULL };
//used to allow derived object implementation //used to allow derived object implementation
- (BOOL)_infoForInstanceVariableNamed: (NSString*)name - (BOOL)_infoForInstanceVariableNamed: (NSString*)name
retType: (const char**)type retType: (const char**)type
retSize: (unsigned*)size retSize: (unsigned int*)size
retOffset: (unsigned*)offset retOffset: (int*)offset
{ {
BOOL ok; BOOL ok;
@ -192,7 +192,7 @@ static const char _c_id[2] = { _C_ID, NULL };
retSize:size retSize:size
retOffset:offset]; retOffset:offset];
*/ */
ok = GSInstanceVariableInfo(self, name, type, size, offset); ok = GSFindInstanceVariable(self, [name cString], type, size, offset);
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC", EOFLOGObjectLevelArgs(@"EOGenericRecordKVC",
@"Super InstanceVar named %@:%s", @"Super InstanceVar named %@:%s",