revi-archive/xz-archive
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2024-04-04 12:36:23 +02:00
Code Activity

liblzma: Add the internal function lzma_alloc_zero().

Browse source
This commit is contained in:
Lasse Collin 2014-05-25 19:25:57 +03:00
parent ed9ac85822
commit 28af24e9cf
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/liblzma/common/common.c
View file

@ -53,6 +53,27 @@ lzma_alloc(size_t size, const lzma_allocator *allocator)
} }
extern void * lzma_attribute((__malloc__)) lzma_attr_alloc_size(1)
lzma_alloc_zero(size_t size, const lzma_allocator *allocator)
{
// Some calloc() variants return NULL if called with size == 0.
if (size == 0)
size = 1;
void *ptr;
if (allocator != NULL && allocator->alloc != NULL) {
ptr = allocator->alloc(allocator->opaque, 1, size);
if (ptr != NULL)
memzero(ptr, size);
} else {
ptr = calloc(1, size);
}
return ptr;
}
extern void extern void
lzma_free(void *ptr, const lzma_allocator *allocator) lzma_free(void *ptr, const lzma_allocator *allocator)
{ {

6
src/liblzma/common/common.h
View file

@ -234,6 +234,12 @@ struct lzma_internal_s {
extern void *lzma_alloc(size_t size, const lzma_allocator *allocator) extern void *lzma_alloc(size_t size, const lzma_allocator *allocator)
lzma_attribute((__malloc__)) lzma_attr_alloc_size(1); lzma_attribute((__malloc__)) lzma_attr_alloc_size(1);
/// Allocates memory and zeroes it (like calloc()). This can be faster
/// than lzma_alloc() + memzero() while being backward compatible with
/// custom allocators.
extern void * lzma_attribute((__malloc__)) lzma_attr_alloc_size(1)
lzma_alloc_zero(size_t size, const lzma_allocator *allocator);
/// Frees memory /// Frees memory
extern void lzma_free(void *ptr, const lzma_allocator *allocator); extern void lzma_free(void *ptr, const lzma_allocator *allocator);