4
0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-21 00:07:36 +08:00

* cygheap.cc (cmalloc): Use size_t for size field.

(cmalloc_abort): Ditto.
(crealloc): Ditto.
(crealloc_abort): Ditto.
(ccalloc): Ditto.
(ccalloc_abort): Ditto.
* cygheap_malloc.h (HEAP_USER): Add.
(cmalloc): Use size_t for size field in declaration.
(cmalloc_abort): Ditto.
(crealloc): Ditto.
(crealloc_abort): Ditto.
(ccalloc): Ditto.
(ccalloc_abort): Ditto.
* path.cc (normalize_posix_path): Don't check existence of / or // dir in
parent dir check.
This commit is contained in:
Christopher Faylor 2013-07-31 14:43:05 +00:00
parent c39e8632d1
commit 24557e9caa
3 changed files with 38 additions and 16 deletions

View File

@ -1,3 +1,24 @@
2013-07-31 Christopher Faylor <me.cygwin2013@cgf.cx>
* cygheap.cc (cmalloc): Use size_t for size field.
(cmalloc_abort): Ditto.
(crealloc): Ditto.
(crealloc_abort): Ditto.
(ccalloc): Ditto.
(ccalloc_abort): Ditto.
* cygheap_malloc.h (HEAP_USER): Add.
(cmalloc): Use size_t for size field in declaration.
(cmalloc_abort): Ditto.
(crealloc): Ditto.
(crealloc_abort): Ditto.
(ccalloc): Ditto.
(ccalloc_abort): Ditto.
2013-07-31 Corinna Vinschen <corinna@vinschen.de>
* path.cc (normalize_posix_path): Don't check existence of / or // dir
in parent dir check.
2013-07-31 Corinna Vinschen <corinna@vinschen.de> 2013-07-31 Corinna Vinschen <corinna@vinschen.de>
* path.cc (normalize_posix_path): Don't check existence of / or // dir * path.cc (normalize_posix_path): Don't check existence of / or // dir

View File

@ -391,7 +391,7 @@ creturn (cygheap_types x, cygheap_entry * c, unsigned len, const char *fn = NULL
} }
inline static void * inline static void *
cmalloc (cygheap_types x, DWORD n, const char *fn) cmalloc (cygheap_types x, size_t n, const char *fn)
{ {
cygheap_entry *c; cygheap_entry *c;
MALLOC_CHECK; MALLOC_CHECK;
@ -400,19 +400,19 @@ cmalloc (cygheap_types x, DWORD n, const char *fn)
} }
extern "C" void * extern "C" void *
cmalloc (cygheap_types x, DWORD n) cmalloc (cygheap_types x, size_t n)
{ {
return cmalloc (x, n, NULL); return cmalloc (x, n, NULL);
} }
extern "C" void * extern "C" void *
cmalloc_abort (cygheap_types x, DWORD n) cmalloc_abort (cygheap_types x, size_t n)
{ {
return cmalloc (x, n, "cmalloc"); return cmalloc (x, n, "cmalloc");
} }
inline static void * inline static void *
crealloc (void *s, DWORD n, const char *fn) crealloc (void *s, size_t n, const char *fn)
{ {
MALLOC_CHECK; MALLOC_CHECK;
if (s == NULL) if (s == NULL)
@ -426,13 +426,13 @@ crealloc (void *s, DWORD n, const char *fn)
} }
extern "C" void *__reg2 extern "C" void *__reg2
crealloc (void *s, DWORD n) crealloc (void *s, size_t n)
{ {
return crealloc (s, n, NULL); return crealloc (s, n, NULL);
} }
extern "C" void *__reg2 extern "C" void *__reg2
crealloc_abort (void *s, DWORD n) crealloc_abort (void *s, size_t n)
{ {
return crealloc (s, n, "crealloc"); return crealloc (s, n, "crealloc");
} }
@ -454,7 +454,7 @@ cfree_and_set (char *&s, char *what)
} }
inline static void * inline static void *
ccalloc (cygheap_types x, DWORD n, DWORD size, const char *fn) ccalloc (cygheap_types x, size_t n, size_t size, const char *fn)
{ {
cygheap_entry *c; cygheap_entry *c;
MALLOC_CHECK; MALLOC_CHECK;
@ -466,13 +466,13 @@ ccalloc (cygheap_types x, DWORD n, DWORD size, const char *fn)
} }
extern "C" void *__reg3 extern "C" void *__reg3
ccalloc (cygheap_types x, DWORD n, DWORD size) ccalloc (cygheap_types x, size_t n, size_t size)
{ {
return ccalloc (x, n, size, NULL); return ccalloc (x, n, size, NULL);
} }
extern "C" void *__reg3 extern "C" void *__reg3
ccalloc_abort (cygheap_types x, DWORD n, DWORD size) ccalloc_abort (cygheap_types x, size_t n, size_t size)
{ {
return ccalloc (x, n, size, "ccalloc"); return ccalloc (x, n, size, "ccalloc");
} }

View File

@ -25,6 +25,7 @@ enum cygheap_types
HEAP_ARCHETYPES, HEAP_ARCHETYPES,
HEAP_TLS, HEAP_TLS,
HEAP_COMMUNE, HEAP_COMMUNE,
HEAP_USER,
HEAP_1_START, HEAP_1_START,
HEAP_1_HOOK, HEAP_1_HOOK,
HEAP_1_STR, HEAP_1_STR,
@ -41,12 +42,12 @@ enum cygheap_types
extern "C" { extern "C" {
void __reg1 cfree (void *); void __reg1 cfree (void *);
void *__reg2 cmalloc (cygheap_types, DWORD); void *__reg2 cmalloc (cygheap_types, size_t);
void *__reg2 crealloc (void *, DWORD); void *__reg2 crealloc (void *, size_t);
void *__reg3 ccalloc (cygheap_types, DWORD, DWORD); void *__reg3 ccalloc (cygheap_types, size_t, size_t);
void *__reg2 cmalloc_abort (cygheap_types, DWORD); void *__reg2 cmalloc_abort (cygheap_types, size_t);
void *__reg2 crealloc_abort (void *, DWORD); void *__reg2 crealloc_abort (void *, size_t);
void *__reg3 ccalloc_abort (cygheap_types, DWORD, DWORD); void *__reg3 ccalloc_abort (cygheap_types, size_t, size_t);
PWCHAR __reg1 cwcsdup (const PWCHAR); PWCHAR __reg1 cwcsdup (const PWCHAR);
PWCHAR __reg1 cwcsdup1 (const PWCHAR); PWCHAR __reg1 cwcsdup1 (const PWCHAR);
char *__reg1 cstrdup (const char *); char *__reg1 cstrdup (const char *);