diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-09-14 14:48:38 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-09-14 14:48:38 +0000 |
commit | 7c411bda5ba29eb8fb5be3841626a485c0d650cb (patch) | |
tree | 049b9b8b77421704c34c29ad0d9a940ff0025f4c /cpukit/libcsupport/src/calloc.c | |
parent | 2009-09-13 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-7c411bda5ba29eb8fb5be3841626a485c0d650cb.tar.bz2 |
2009-09-14 Sebastian Huber <Sebastian.Huber@embedded-brains.de>
* score/src/wkspace.c: Removed work space area consistency checks.
* libblock/include/rtems/ide_part_table.h: Functions are now
deprecated.
* libcsupport/include/rtems/libcsupport.h, libcsupport/src/calloc.c,
libcsupport/src/malloc_boundary.c,
libcsupport/src/malloc_initialize.c,
libcsupport/src/malloc_report_statistics_plugin.c,
libcsupport/src/malloc_statistics_helpers.c,
libcsupport/src/malloc_walk.c, libcsupport/src/realloc.c,
rtems/inline/rtems/rtems/region.inl: Update for heap API changes.
2009-09-14 Christian Mauderer <christian.mauderer@embedded-brains.de>
* libcsupport/src/vprintk.c: Fixed warnings. Print nothing in case the
pointer to the string is NULL.
Diffstat (limited to 'cpukit/libcsupport/src/calloc.c')
-rw-r--r-- | cpukit/libcsupport/src/calloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpukit/libcsupport/src/calloc.c b/cpukit/libcsupport/src/calloc.c index 2a43736d71..4f51210f91 100644 --- a/cpukit/libcsupport/src/calloc.c +++ b/cpukit/libcsupport/src/calloc.c @@ -25,7 +25,7 @@ void *calloc( ) { register char *cptr; - int length; + size_t length; MSBUMP(calloc_calls, 1); @@ -34,7 +34,7 @@ void *calloc( if ( cptr ) memset( cptr, '\0', length ); - MSBUMP(malloc_calls, -1); /* subtract off the malloc */ + MSBUMP(malloc_calls, (uint32_t) -1); /* subtract off the malloc */ return cptr; } |