gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Structure coding fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@16420 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2003-04-10 17:35:11 +00:00
parent dd00158127
commit a18e9de578
2 changed files with 19 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -8,6 +8,7 @@
* Source/GSFFCallInvocation.m: minor tidy up.
* Source/NSArchiver.m: Structure encoding/decoding fixes.
* Source/NSData.m: Structure encoding/decoding fixes.
* Source/NSPortCoder.m: Structure encoding/decoding fixes.
* Source/NSUnarchiver.m: Structure encoding/decoding fixes.
2003-04-09 Richard Frith-Macdonald <rfm@gnu.org>

58
Source/NSPortCoder.m
View file

@ -736,29 +736,19 @@ static IMP _xRefImp; /* Serialize a crossref. */
case _GSC_STRUCT_B:
{
int offset = 0;
struct objc_struct_layout layout;
typeCheck(*type, _GSC_STRUCT_B);
while (*type != _C_STRUCT_E && *type++ != '='); /* skip "<name>=" */
for (;;)
objc_layout_structure (type, &layout);
while (objc_layout_structure_next_member (&layout))
{
(*_dValImp)(self, dValSel, type, (char*)address + offset);
offset += objc_sizeof_type(type);
type = objc_skip_typespec(type);
if (*type == _C_STRUCT_E)
{
break;
}
else
{
int align = objc_alignof_type(type);
int rem = offset % align;
int offset;
int align;
const char *ftype;
if (rem != 0)
{
offset += align - rem;
}
}
objc_layout_structure_get_info (&layout, &offset, &align, &ftype);
(*_dValImp)(self, dValSel, ftype, (char*)address + offset);
}
return;
}
@ -1344,34 +1334,22 @@ static IMP _xRefImp; /* Serialize a crossref. */
case _C_STRUCT_B:
{
int offset = 0;
struct objc_struct_layout layout;
if (_initialPass == NO)
{
(*_eTagImp)(_dst, eTagSel, _GSC_STRUCT_B);
}
while (*type != _C_STRUCT_E && *type++ != '='); /* skip "<name>=" */
for (;;)
objc_layout_structure (type, &layout);
while (objc_layout_structure_next_member (&layout))
{
(*_eValImp)(self, eValSel, type, (char*)buf + offset);
offset += objc_sizeof_type(type);
type = objc_skip_typespec(type);
if (*type == _C_STRUCT_E)
{
break;
}
else
{
int align = objc_alignof_type(type);
int rem = offset % align;
int offset;
int align;
const char *ftype;
if (rem != 0)
{
offset += align - rem;
}
}
objc_layout_structure_get_info (&layout, &offset, &align, &ftype);
(*_eValImp)(self, eValSel, ftype, (char*)buf + offset);
}
}
return;