diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-02-14 18:13:25 -0500 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-02-14 18:24:52 -0500 |
| commit | 2e0614750c398c9aac2f4064addb2fa95ba32282 (patch) | |
| tree | 001de946d598d4ea4b2dd6a4a09790ce590e69a5 | |
| parent | f2f4edd8a7bc73d2923e783220fe2a3e9aec18dd (diff) | |
| download | rust-2e0614750c398c9aac2f4064addb2fa95ba32282.tar.gz rust-2e0614750c398c9aac2f4064addb2fa95ba32282.zip | |
get rid of unused exchange_alloc calloc method
this isn't actually calloc - it calls the malloc wrapper which no longer zeroes
| -rw-r--r-- | src/rt/rust_exchange_alloc.cpp | 5 | ||||
| -rw-r--r-- | src/rt/rust_exchange_alloc.h | 1 | ||||
| -rw-r--r-- | src/rt/rust_kernel.cpp | 5 | ||||
| -rw-r--r-- | src/rt/rust_kernel.h | 1 |
4 files changed, 0 insertions, 12 deletions
diff --git a/src/rt/rust_exchange_alloc.cpp b/src/rt/rust_exchange_alloc.cpp index eda3dbee831..a92bc4edd41 100644 --- a/src/rt/rust_exchange_alloc.cpp +++ b/src/rt/rust_exchange_alloc.cpp @@ -28,11 +28,6 @@ rust_exchange_alloc::malloc(size_t size) { } void * -rust_exchange_alloc::calloc(size_t size) { - return this->malloc(size); -} - -void * rust_exchange_alloc::realloc(void *ptr, size_t size) { void *new_ptr = ::realloc(ptr, size); assert(new_ptr); diff --git a/src/rt/rust_exchange_alloc.h b/src/rt/rust_exchange_alloc.h index d904d345666..767caf01323 100644 --- a/src/rt/rust_exchange_alloc.h +++ b/src/rt/rust_exchange_alloc.h @@ -17,7 +17,6 @@ class rust_exchange_alloc { public: void *malloc(size_t size); - void *calloc(size_t size); void *realloc(void *mem, size_t size); void free(void *mem); }; diff --git a/src/rt/rust_kernel.cpp b/src/rt/rust_kernel.cpp index e0494c9300b..75d70396aac 100644 --- a/src/rt/rust_kernel.cpp +++ b/src/rt/rust_kernel.cpp @@ -80,11 +80,6 @@ rust_kernel::malloc(size_t size, const char *tag) { } void * -rust_kernel::calloc(size_t size, const char *tag) { - return exchange_alloc.calloc(size); -} - -void * rust_kernel::realloc(void *mem, size_t size) { return exchange_alloc.realloc(mem, size); } diff --git a/src/rt/rust_kernel.h b/src/rt/rust_kernel.h index 11af02dace4..d814e49c808 100644 --- a/src/rt/rust_kernel.h +++ b/src/rt/rust_kernel.h @@ -133,7 +133,6 @@ public: void fatal(char const *fmt, ...); void *malloc(size_t size, const char *tag); - void *calloc(size_t size, const char *tag); void *realloc(void *mem, size_t size); void free(void *mem); rust_exchange_alloc *region() { return &exchange_alloc; } |
