X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Futil%2Fralloc.c;h=9526011b83674079815a21b744187c593480e689;hb=b7bee2505239ef1a14fecde5b73ffdab67694aa2;hp=6d4032bd4f673b85fb35755cfe2a2714b36f404c;hpb=14193e4643370db92210710f2ef152c693d6c4ff;p=mesa.git diff --git a/src/util/ralloc.c b/src/util/ralloc.c index 6d4032bd4f6..9526011b836 100644 --- a/src/util/ralloc.c +++ b/src/util/ralloc.c @@ -109,6 +109,18 @@ ralloc_context(const void *ctx) void * ralloc_size(const void *ctx, size_t size) +{ + /* ralloc_size was originally implemented using calloc, which meant some + * code accidentally relied on its zero filling behavior. + * + * TODO: Make ralloc_size not zero fill memory, and cleanup any code that + * should instead be using rzalloc. + */ + return rzalloc_size(ctx, size); +} + +void * +rzalloc_size(const void *ctx, size_t size) { void *block = calloc(1, size + sizeof(ralloc_header)); ralloc_header *info; @@ -128,15 +140,6 @@ ralloc_size(const void *ctx, size_t size) return PTR_FROM_HEADER(info); } -void * -rzalloc_size(const void *ctx, size_t size) -{ - void *ptr = ralloc_size(ctx, size); - if (likely(ptr != NULL)) - memset(ptr, 0, size); - return ptr; -} - /* helper function - assumes ptr != NULL */ static void * resize(void *ptr, size_t size)