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

remove a little redundant code

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@38535 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2015-05-24 21:22:58 +00:00
parent b5a6e5c255
commit 0b3e806557
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Source/NSZone.m
View file

@ -120,10 +120,13 @@ default_malloc (NSZone *zone, size_t size)
void *mem;
mem = malloc(size);
if (mem == NULL)
[NSException raise: NSMallocException
format: @"Default zone has run out of memory"];
return mem;
if (mem != NULL)
{
return mem;
}
[NSException raise: NSMallocException
format: @"Default zone has run out of memory"];
return 0;
}
static void*
@ -131,24 +134,14 @@ default_realloc (NSZone *zone, void *ptr, size_t size)
{
void *mem;
if (size == 0)
mem = realloc(ptr, size);
if (mem != NULL)
{
free(ptr);
return NULL;
}
if (ptr == 0)
{
mem = malloc(size);
if (mem == NULL)
[NSException raise: NSMallocException
format: @"Default zone has run out of memory"];
return mem;
}
mem = realloc(ptr, size);
if (mem == NULL)
[NSException raise: NSMallocException
format: @"Default zone has run out of memory"];
return mem;
[NSException raise: NSMallocException
format: @"Default zone has run out of memory"];
return 0;
}
static void
@ -271,7 +264,7 @@ NSCreateZone (NSUInteger start, NSUInteger gran, BOOL canFree)
return &default_zone;
}
NSZone*
inline NSZone*
NSDefaultMallocZone (void)
{
return &default_zone;
@ -443,7 +436,7 @@ NSCreateZone (NSUInteger start, NSUInteger gran, BOOL canFree)
return &default_zone;
}
NSZone*
inline NSZone*
NSDefaultMallocZone (void)
{
return &default_zone;
@ -2072,6 +2065,18 @@ NSCreateZone (NSUInteger start, NSUInteger gran, BOOL canFree)
void*
NSZoneCalloc (NSZone *zone, NSUInteger elems, NSUInteger bytes)
{
void *mem;
if (0 == zone || NSDefaultMallocZone() == zone)
{
mem = calloc(elems, bytes);
if (mem != NULL)
{
return mem;
}
[NSException raise: NSMallocException
format: @"Default zone has run out of memory"];
}
return memset(NSZoneMalloc(zone, elems*bytes), 0, elems*bytes);
}