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

DO and encoding updates

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@6861 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 2000-07-02 18:57:05 +00:00
parent 656fde90c0
commit dae20769ac
12 changed files with 285 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Source/NSData.m
View file

@ -826,15 +826,12 @@ failure:
else
{
unsigned len = (length+1)*sizeof(char);
NSZone *z = [self zone];
NSData *d;
*(char**)data = (char*)NSZoneMalloc(z, len);
d = [dataMalloc allocWithZone: z];
d = [d initWithBytesNoCopy: *(void**)data
length: len
fromZone: z];
IF_NO_GC(AUTORELEASE(d));
#if GS_WITH_GC == 0
*(char**)data = (char*)NSZoneMalloc(NSDefaultMallocZone(), len);
#else
*(char**)data = (char*)NSZoneMalloc(NSAtomicMallocZone(), len);
#endif
}
[self deserializeBytes: *(char**)data
@ -896,15 +893,12 @@ failure:
case _C_PTR:
{
unsigned len = objc_sizeof_type(++type);
NSZone *z = [self zone];
NSData *d;
*(char**)data = (char*)NSZoneMalloc(z, len);
d = [dataMalloc allocWithZone: z];
d = [d initWithBytesNoCopy: *(void**)data
length: len
fromZone: z];
IF_NO_GC(AUTORELEASE(d));
#if GS_WITH_GC == 0
*(char**)data = (char*)NSZoneMalloc(NSDefaultMallocZone(), len);
#else
*(char**)data = (char*)NSZoneMalloc(NSAtomicMallocZone(), len);
#endif
[self deserializeDataAt: *(char**)data
ofObjCType: type
atCursor: cursor
@ -1937,14 +1931,10 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
}
else
{
NSZone *z = [self zone];
*(char**)data = (char*)NSZoneMalloc(z, len+1);
#if !GS_WITH_GC
[[[dataMalloc allocWithZone: z]
initWithBytesNoCopy: *(void**)data
length: len+1
fromZone: z] autorelease];
#if GS_WITH_GC == 0
*(char**)data = (char*)NSZoneMalloc(NSDefaultMallocZone(), len+1);
#else
*(char**)data = (char*)NSZoneMalloc(NSAtomicMallocZone(), len+1);
#endif
}
getBytes(*(void**)data, bytes, len, length, cursor);
@ -2004,14 +1994,11 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
case _C_PTR:
{
unsigned len = objc_sizeof_type(++type);
NSZone *z = [self zone];
*(char**)data = (char*)NSZoneMalloc(z, len);
#if !GS_WITH_GC
[[[dataMalloc allocWithZone: z]
initWithBytesNoCopy: *(void**)data
length: len
fromZone: z] autorelease];
#if GS_WITH_GC == 0
*(char**)data = (char*)NSZoneMalloc(NSDefaultMallocZone(), len);
#else
*(char**)data = (char*)NSZoneMalloc(NSAtomicMallocZone(), len);
#endif
[self deserializeDataAt: *(char**)data
ofObjCType: type