Remove MALLOC_CHECK and calls to it entirely
MALLOC_CHECK got useless with commit b259af5
. Remove it throughout.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
@@ -409,7 +409,6 @@ creturn (cygheap_types x, cygheap_entry * c, unsigned len, const char *fn = NULL
|
||||
char *cend = ((char *) c + sizeof (*c) + len);
|
||||
if (cygheap_max < cend)
|
||||
cygheap_max = cend;
|
||||
MALLOC_CHECK;
|
||||
return (void *) c->data;
|
||||
}
|
||||
|
||||
@@ -417,7 +416,6 @@ inline static void *
|
||||
cmalloc (cygheap_types x, size_t n, const char *fn)
|
||||
{
|
||||
cygheap_entry *c;
|
||||
MALLOC_CHECK;
|
||||
c = (cygheap_entry *) _cmalloc (sizeof_cygheap (n));
|
||||
return creturn (x, c, n, fn);
|
||||
}
|
||||
@@ -437,7 +435,6 @@ cmalloc_abort (cygheap_types x, size_t n)
|
||||
inline static void *
|
||||
crealloc (void *s, size_t n, const char *fn)
|
||||
{
|
||||
MALLOC_CHECK;
|
||||
if (s == NULL)
|
||||
return cmalloc (HEAP_STR, n); // kludge
|
||||
|
||||
@@ -465,7 +462,6 @@ cfree (void *s)
|
||||
{
|
||||
assert (!inheap (s));
|
||||
_cfree (tocygheap (s));
|
||||
MALLOC_CHECK;
|
||||
}
|
||||
|
||||
extern "C" void __reg2
|
||||
@@ -480,7 +476,6 @@ inline static void *
|
||||
ccalloc (cygheap_types x, size_t n, size_t size, const char *fn)
|
||||
{
|
||||
cygheap_entry *c;
|
||||
MALLOC_CHECK;
|
||||
n *= size;
|
||||
c = (cygheap_entry *) _cmalloc (sizeof_cygheap (n));
|
||||
if (c)
|
||||
@@ -503,48 +498,40 @@ ccalloc_abort (cygheap_types x, size_t n, size_t size)
|
||||
extern "C" PWCHAR __reg1
|
||||
cwcsdup (PCWSTR s)
|
||||
{
|
||||
MALLOC_CHECK;
|
||||
PWCHAR p = (PWCHAR) cmalloc (HEAP_STR, (wcslen (s) + 1) * sizeof (WCHAR));
|
||||
if (!p)
|
||||
return NULL;
|
||||
wcpcpy (p, s);
|
||||
MALLOC_CHECK;
|
||||
return p;
|
||||
}
|
||||
|
||||
extern "C" PWCHAR __reg1
|
||||
cwcsdup1 (PCWSTR s)
|
||||
{
|
||||
MALLOC_CHECK;
|
||||
PWCHAR p = (PWCHAR) cmalloc (HEAP_1_STR, (wcslen (s) + 1) * sizeof (WCHAR));
|
||||
if (!p)
|
||||
return NULL;
|
||||
wcpcpy (p, s);
|
||||
MALLOC_CHECK;
|
||||
return p;
|
||||
}
|
||||
|
||||
extern "C" char *__reg1
|
||||
cstrdup (const char *s)
|
||||
{
|
||||
MALLOC_CHECK;
|
||||
char *p = (char *) cmalloc (HEAP_STR, strlen (s) + 1);
|
||||
if (!p)
|
||||
return NULL;
|
||||
strcpy (p, s);
|
||||
MALLOC_CHECK;
|
||||
return p;
|
||||
}
|
||||
|
||||
extern "C" char *__reg1
|
||||
cstrdup1 (const char *s)
|
||||
{
|
||||
MALLOC_CHECK;
|
||||
char *p = (char *) cmalloc (HEAP_1_STR, strlen (s) + 1);
|
||||
if (!p)
|
||||
return NULL;
|
||||
strcpy (p, s);
|
||||
MALLOC_CHECK;
|
||||
return p;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user