motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-01 06:43:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consolidate oom_check() functions

Browse source 
This consolidates the duplicated oom_check() functions, as well as
splitting them into OS dependant versions to avoid the #ifdef
grossness that was present in the old osdep.c version.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Jes Sorensen 2010-10-26 10:39:26 +02:00 • committed by Blue Swirl
parent bc4a957c46
commit b152aa84d5
5 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
qemu-malloc.c
View file

@ -25,14 +25,6 @@
#include "trace.h"
#include <stdlib.h>
static void *oom_check(void *ptr)
{
if (ptr == NULL) {
abort();
}
return ptr;
}
void qemu_free(void *ptr)
{
trace_qemu_free(ptr);
@ -54,7 +46,7 @@ void *qemu_malloc(size_t size)
if (!size && !allow_zero_malloc()) {
abort();
}
ptr = oom_check(malloc(size ? size : 1));
ptr = qemu_oom_check(malloc(size ? size : 1));
trace_qemu_malloc(size, ptr);
return ptr;
}
@ -65,7 +57,7 @@ void *qemu_realloc(void *ptr, size_t size)
if (!size && !allow_zero_malloc()) {
abort();
}
newptr = oom_check(realloc(ptr, size ? size : 1));
newptr = qemu_oom_check(realloc(ptr, size ? size : 1));
trace_qemu_realloc(ptr, size, newptr);
return newptr;
}
@ -75,7 +67,7 @@ void *qemu_mallocz(size_t size)
if (!size && !allow_zero_malloc()) {
abort();
}
return oom_check(calloc(1, size ? size : 1));
return qemu_oom_check(calloc(1, size ? size : 1));
}
char *qemu_strdup(const char *str)