# HG changeset patch # User reimar # Date 1236356851 0 # Node ID c64464d924d5deaea189f8f169e98bc3b70bc404 # Parent 6e5b9867646cee6a28c22524bdff32bd86559935 Use calloc instead of malloc+memset diff -r 6e5b9867646c -r c64464d924d5 libao2/ao_win32.c --- a/libao2/ao_win32.c Fri Mar 06 15:52:48 2009 +0000 +++ b/libao2/ao_win32.c Fri Mar 06 16:27:31 2009 +0000 @@ -146,7 +146,6 @@ static int init(int rate,int channels,int format,int flags) { WAVEFORMATEXTENSIBLE wformat; - DWORD totalBufferSize = (BUFFER_SIZE + sizeof(WAVEHDR)) * BUFFER_COUNT; MMRESULT result; unsigned char* buffer; int i; @@ -231,8 +230,7 @@ return 0; } //allocate buffer memory as one big block - buffer = malloc(totalBufferSize); - memset(buffer,0x0,totalBufferSize); + buffer = calloc(BUFFER_COUNT, BUFFER_SIZE + sizeof(WAVEHDR)); //and setup pointers to each buffer waveBlocks = (WAVEHDR*)buffer; buffer += sizeof(WAVEHDR) * BUFFER_COUNT;