diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2012-03-24 15:19:09 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2012-03-24 15:19:09 +0100 |
commit | 14fdc1c5cd4ca0b3f88b2d407d40ba5be7218085 (patch) | |
tree | 4cf27501438c4d717f11ba759adec67da5ab919c /source3/lib | |
parent | c0c52ac1a40db70d8b19cb8d73ed4759b0a4f905 (diff) | |
download | samba-14fdc1c5cd4ca0b3f88b2d407d40ba5be7218085.tar.gz samba-14fdc1c5cd4ca0b3f88b2d407d40ba5be7218085.tar.bz2 samba-14fdc1c5cd4ca0b3f88b2d407d40ba5be7218085.zip |
lib/util: Move calloc_array and memalign_array to top-level libutil.
Diffstat (limited to 'source3/lib')
-rw-r--r-- | source3/lib/util_malloc.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/source3/lib/util_malloc.c b/source3/lib/util_malloc.c index d773d8ffd6..b2ef49d81e 100644 --- a/source3/lib/util_malloc.c +++ b/source3/lib/util_malloc.c @@ -70,38 +70,6 @@ static void *realloc_(void *ptr, size_t size) #endif /* PARANOID_MALLOC_CHECKER */ /**************************************************************************** - Type-safe memalign -****************************************************************************/ - -void *memalign_array(size_t el_size, size_t align, unsigned int count) -{ - if (count >= MAX_ALLOC_SIZE/el_size) { - return NULL; - } - - return memalign(align, el_size*count); -} - -/**************************************************************************** - Type-safe calloc. -****************************************************************************/ - -void *calloc_array(size_t size, size_t nmemb) -{ - if (nmemb >= MAX_ALLOC_SIZE/size) { - return NULL; - } - if (size == 0 || nmemb == 0) { - return NULL; - } -#if defined(PARANOID_MALLOC_CHECKER) - return calloc_(nmemb, size); -#else - return calloc(nmemb, size); -#endif -} - -/**************************************************************************** Expand a pointer to be a particular size. Note that this version of Realloc has an extra parameter that decides whether to free the passed in storage on allocation failure or if the |