Mercurial > sdl-ios-xcode
diff src/audio/disk/SDL_diskaudio.c @ 1336:3692456e7b0f
Use SDL_ prefixed versions of C library functions.
FIXME:
Change #include <stdlib.h> to #include "SDL_stdlib.h"
Change #include <string.h> to #include "SDL_string.h"
Make sure nothing else broke because of this...
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Tue, 07 Feb 2006 06:59:48 +0000 |
parents | c9b51268668f |
children | 604d73db6802 |
line wrap: on
line diff
--- a/src/audio/disk/SDL_diskaudio.c Mon Feb 06 17:28:04 2006 +0000 +++ b/src/audio/disk/SDL_diskaudio.c Tue Feb 07 06:59:48 2006 +0000 @@ -62,7 +62,7 @@ static const char *DISKAUD_GetOutputFilename(void) { - const char *envr = getenv(DISKENVR_OUTFILE); + const char *envr = SDL_getenv(DISKENVR_OUTFILE); return((envr != NULL) ? envr : DISKDEFAULT_OUTFILE); } @@ -75,10 +75,10 @@ int exists = 0; struct stat statbuf; const char *fname = DISKAUD_GetOutputFilename(); - const char *envr = getenv("SDL_AUDIODRIVER"); + const char *envr = SDL_getenv("SDL_AUDIODRIVER"); available = 0; - if ((envr) && (strcmp(envr, DISKAUD_DRIVER_NAME) == 0)) { + if ((envr) && (SDL_strcmp(envr, DISKAUD_DRIVER_NAME) == 0)) { if (stat(fname, &statbuf) == 0) exists = 1; @@ -93,8 +93,8 @@ } return(available); #else - const char *envr = getenv("SDL_AUDIODRIVER"); - if ((envr) && (strcmp(envr, DISKAUD_DRIVER_NAME) == 0)) { + const char *envr = SDL_getenv("SDL_AUDIODRIVER"); + if ((envr) && (SDL_strcmp(envr, DISKAUD_DRIVER_NAME) == 0)) { return(1); } @@ -104,8 +104,8 @@ static void DISKAUD_DeleteDevice(SDL_AudioDevice *device) { - free(device->hidden); - free(device); + SDL_free(device->hidden); + SDL_free(device); } static SDL_AudioDevice *DISKAUD_CreateDevice(int devindex) @@ -114,22 +114,22 @@ const char *envr; /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)malloc(sizeof(SDL_AudioDevice)); + this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); if ( this ) { - memset(this, 0, (sizeof *this)); + SDL_memset(this, 0, (sizeof *this)); this->hidden = (struct SDL_PrivateAudioData *) - malloc((sizeof *this->hidden)); + SDL_malloc((sizeof *this->hidden)); } if ( (this == NULL) || (this->hidden == NULL) ) { SDL_OutOfMemory(); if ( this ) { - free(this); + SDL_free(this); } return(0); } - memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - envr = getenv(DISKENVR_WRITEDELAY); + envr = SDL_getenv(DISKENVR_WRITEDELAY); this->hidden->write_delay = (envr) ? atoi(envr) : DISKDEFAULT_WRITEDELAY; /* Set the function pointers */ @@ -216,7 +216,7 @@ if ( this->hidden->mixbuf == NULL ) { return(-1); } - memset(this->hidden->mixbuf, spec->silence, spec->size); + SDL_memset(this->hidden->mixbuf, spec->silence, spec->size); /* We're ready to rock and roll. :-) */ return(0);