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

revert port coder changes ... not working. Tidy others

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34837 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-02-27 23:26:18 +00:00
parent 9d7b2d8f2b
commit 904b71e814
3 changed files with 10 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/NSArchiver.m
View file

@ -314,7 +314,6 @@ static Class NSMutableDataMallocClass;
}
else
{
i = byteCount;
for (i = 0; i < byteCount; i++)
{
(*_serImp)(_dst, serSel, bytePtr + i, @encode(uint8_t), nil);
@ -337,7 +336,6 @@ static Class NSMutableDataMallocClass;
}
else
{
i = byteCount;
for (i = 0; i < byteCount; i++)
{
(*_serImp)(_dst, serSel, bytePtr + i, @encode(uint8_t), nil);

96
Source/NSPortCoder.m
View file

@ -433,47 +433,14 @@ static IMP _xRefImp; /* Serialize a crossref. */
count: (NSUInteger)expected
at: (void*)buf
{
NSUInteger i;
NSUInteger offset = 0;
unsigned size = objc_sizeof_type(type);
unsigned int i;
int offset = 0;
int size = objc_sizeof_type(type);
unsigned char info;
NSUInteger count;
unsigned count;
(*_dTagImp)(_src, dTagSel, &info, 0, &_cursor);
if (_version > 12401)
{
uint8_t c;
/* Unpack variable length count.
*/
count = 0;
for (;;)
{
if (count * 128 < count)
{
[NSException raise: NSInternalInconsistencyException
format: @"overflow in array count"];
}
count *= 128;
(*_dDesImp)(self, dDesSel, &c, @encode(uint8_t), &_cursor, nil);
if (c & 128)
{
count += (c & 127);
}
else
{
count += c;
break;
}
}
}
else
{
unsigned c;
(*_dDesImp)(self, dDesSel, &c, @encode(unsigned), &_cursor, nil);
count = c;
}
(*_dDesImp)(_src, dDesSel, &count, @encode(unsigned), &_cursor, nil);
if (info != _GSC_ARY_B)
{
[NSException raise: NSInternalInconsistencyException
@ -1134,33 +1101,11 @@ static IMP _xRefImp; /* Serialize a crossref. */
count: (NSUInteger)count
at: (const void*)buf
{
NSUInteger i;
unsigned c = count;
uint8_t bytes[20];
uint8_t *bytePtr = 0;
uint8_t byteCount = 0;
NSUInteger offset = 0;
unsigned i;
unsigned offset = 0;
unsigned size = objc_sizeof_type(type);
uchar info;
/* The array count is encoded as a sequence of bytes containing 7bits of
* data and using the eighth (top) bit to indicate that there are more
* bytes in the sequence.
*/
if ([self systemVersion] > 12401)
{
NSUInteger tmp = count;
bytes[sizeof(bytes) - ++byteCount] = (uint8_t)(tmp % 128);
tmp /= 128;
while (tmp > 0)
{
bytes[sizeof(bytes) - ++byteCount] = (uint8_t)(128 | (tmp % 128));
tmp /= 128;
}
bytePtr = &bytes[sizeof(bytes) - byteCount];
}
switch (*type)
{
case _C_ID: info = _GSC_NONE; break;
@ -1188,19 +1133,7 @@ static IMP _xRefImp; /* Serialize a crossref. */
if (_initialPass == NO)
{
(*_eTagImp)(_dst, eTagSel, _GSC_ARY_B);
if (0 == byteCount)
{
(*_eSerImp)(_dst, eSerSel, &c, @encode(unsigned), nil);
}
else
{
i = byteCount;
for (i = 0; i < byteCount; i++)
{
(*_eSerImp)
(_dst, eSerSel, bytePtr + i, @encode(uint8_t), nil);
}
}
(*_eSerImp)(_dst, eSerSel, &count, @encode(unsigned), nil);
}
for (i = 0; i < count; i++)
{
@ -1211,18 +1144,7 @@ static IMP _xRefImp; /* Serialize a crossref. */
else if (_initialPass == NO)
{
(*_eTagImp)(_dst, eTagSel, _GSC_ARY_B);
if (0 == byteCount)
{
(*_eSerImp)(_dst, eSerSel, &c, @encode(unsigned), nil);
}
else
{
i = byteCount;
for (i = 0; i < byteCount; i++)
{
(*_eSerImp)(_dst, eSerSel, bytePtr + i, @encode(uint8_t), nil);
}
}
(*_eSerImp)(_dst, eSerSel, &count, @encode(unsigned), nil);
(*_eTagImp)(_dst, eTagSel, info);
for (i = 0; i < count; i++)

2
Source/NSUnarchiver.m
View file

@ -536,7 +536,7 @@ static Class NSDataMallocClass;
NSUInteger count;
(*tagImp)(src, tagSel, &info, 0, &cursor);
if (version > 12401)
if ([self systemVersion] > 12401)
{
uint8_t c;