gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Various fixes towards standardising runtime API and to cope with

Browse source 
unarchiving better where a class referred to in the archive does
not exist in the executing program.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@12625 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-02-21 13:31:13 +00:00
parent 737d93b364
commit 59bdeabe4b
8 changed files with 324 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Source/NSData.m
View file

@ -1145,11 +1145,12 @@ failure:
length: ni
atCursor: cursor];
name[ni] = '\0';
c = objc_get_class(name);
c = GSClassFromName(name);
if (c == 0)
{
[NSException raise: NSInternalInconsistencyException
format: @"can't find class - %s", name];
NSLog(@"[%s %s] can't find class - %s",
GSNameFromClass([self class]),
GSNameFromSelector(_cmd), name);
}
*(Class*)data = c;
}
@ -1783,7 +1784,7 @@ failure:
}
case _C_CLASS:
{
const char *name = *(Class*)data?GSObjCName(*(Class*)data):"";
const char *name = *(Class*)data?GSNameFromClass(*(Class*)data):"";
gsu16 ln = (gsu16)strlen(name);
gsu16 ni;
@ -1797,9 +1798,9 @@ failure:
}
case _C_SEL:
{
const char *name = *(SEL*)data?GSObjCSelectorName(*(SEL*)data):"";
const char *name = *(SEL*)data?GSNameFromSelector(*(SEL*)data):"";
gsu16 ln = (name == 0) ? 0 : (gsu16)strlen(name);
const char *types = *(SEL*)data?GSObjCSelectorTypes(*(SEL*)data):"";
const char *types = *(SEL*)data?GSTypesFromSelector(*(SEL*)data):"";
gsu16 lt = (types == 0) ? 0 : (gsu16)strlen(types);
gsu16 ni;
@ -2242,11 +2243,12 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
getBytes((void*)name, bytes, ni, length, cursor);
name[ni] = '\0';
c = objc_get_class(name);
c = GSClassFromName(name);
if (c == 0)
{
[NSException raise: NSInternalInconsistencyException
format: @"can't find class - %s", name];
NSLog(@"[%s %s] can't find class - %s",
GSNameFromClass([self class]),
GSNameFromSelector(_cmd), name);
}
*(Class*)data = c;
}
@ -2973,7 +2975,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
}
case _C_CLASS:
{
const char *name = *(Class*)data?GSObjCName(*(Class*)data):"";
const char *name = *(Class*)data?GSNameFromClass(*(Class*)data):"";
gsu16 ln = (gsu16)strlen(name);
gsu16 minimum = length + ln + sizeof(gsu16);
gsu16 ni;
@ -2994,9 +2996,9 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
}
case _C_SEL:
{
const char *name = *(SEL*)data?GSObjCSelectorName(*(SEL*)data):"";
const char *name = *(SEL*)data?GSNameFromSelector(*(SEL*)data):"";
gsu16 ln = (name == 0) ? 0 : (gsu16)strlen(name);
const char *types = *(SEL*)data?GSObjCSelectorTypes(*(SEL*)data):"";
const char *types = *(SEL*)data?GSTypesFromSelector(*(SEL*)data):"";
gsu16 lt = (types == 0) ? 0 : (gsu16)strlen(types);
gsu16 minimum = length + ln + lt + 2*sizeof(gsu16);
gsu16 ni;