pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations.

Browse source 
OpenGL renderer in progress

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401965
This commit is contained in:
Sam Lantinga 2006-07-22 08:33:18 +00:00
parent 2b538200ba
commit 2fe561616a
9 changed files with 218 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/video/SDL_pixels.c
View file

@ -346,12 +346,11 @@ SDL_AllocFormat(int bpp,
Uint32 mask;
/* Allocate an empty pixel format structure */
format = SDL_malloc(sizeof(*format));
format = SDL_calloc(1, sizeof(*format));
if (format == NULL) {
SDL_OutOfMemory();
return (NULL);
}
SDL_memset(format, 0, sizeof(*format));
format->alpha = SDL_ALPHA_OPAQUE;
/* Set up the format */
@ -714,22 +713,20 @@ SDL_AllocBlitMap(void)
SDL_BlitMap *map;
/* Allocate the empty map */
map = (SDL_BlitMap *) SDL_malloc(sizeof(*map));
map = (SDL_BlitMap *) SDL_calloc(1, sizeof(*map));
if (map == NULL) {
SDL_OutOfMemory();
return (NULL);
}
SDL_memset(map, 0, sizeof(*map));
/* Allocate the software blit data */
map->sw_data =
(struct private_swaccel *) SDL_malloc(sizeof(*map->sw_data));
(struct private_swaccel *) SDL_calloc(1, sizeof(*map->sw_data));
if (map->sw_data == NULL) {
SDL_FreeBlitMap(map);
SDL_OutOfMemory();
return (NULL);
}
SDL_memset(map->sw_data, 0, sizeof(*map->sw_data));
/* It's ready to go */
return (map);