Mercurial > sdl-ios-xcode
comparison src/cdrom/SDL_cdrom.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 | 450721ad5436 |
children | 604d73db6802 |
comparison
equal
deleted
inserted
replaced
1335:c39265384763 | 1336:3692456e7b0f |
---|---|
115 } | 115 } |
116 if ( drive >= SDL_numcds ) { | 116 if ( drive >= SDL_numcds ) { |
117 SDL_SetError("Invalid CD-ROM drive index"); | 117 SDL_SetError("Invalid CD-ROM drive index"); |
118 return(NULL); | 118 return(NULL); |
119 } | 119 } |
120 cdrom = (SDL_CD *)malloc(sizeof(*cdrom)); | 120 cdrom = (SDL_CD *)SDL_malloc(sizeof(*cdrom)); |
121 if ( cdrom == NULL ) { | 121 if ( cdrom == NULL ) { |
122 SDL_OutOfMemory(); | 122 SDL_OutOfMemory(); |
123 return(NULL); | 123 return(NULL); |
124 } | 124 } |
125 memset(cdrom, 0, sizeof(*cdrom)); | 125 SDL_memset(cdrom, 0, sizeof(*cdrom)); |
126 cdrom->id = SDL_CDcaps.Open(drive); | 126 cdrom->id = SDL_CDcaps.Open(drive); |
127 if ( cdrom->id < 0 ) { | 127 if ( cdrom->id < 0 ) { |
128 free(cdrom); | 128 SDL_free(cdrom); |
129 return(NULL); | 129 return(NULL); |
130 } | 130 } |
131 default_cdrom = cdrom; | 131 default_cdrom = cdrom; |
132 return(cdrom); | 132 return(cdrom); |
133 } | 133 } |
330 /* Check if the CD-ROM subsystem has been initialized */ | 330 /* Check if the CD-ROM subsystem has been initialized */ |
331 if ( ! CheckInit(1, &cdrom) ) { | 331 if ( ! CheckInit(1, &cdrom) ) { |
332 return; | 332 return; |
333 } | 333 } |
334 SDL_CDcaps.Close(cdrom); | 334 SDL_CDcaps.Close(cdrom); |
335 free(cdrom); | 335 SDL_free(cdrom); |
336 default_cdrom = NULL; | 336 default_cdrom = NULL; |
337 } | 337 } |
338 | 338 |
339 void SDL_CDROMQuit(void) | 339 void SDL_CDROMQuit(void) |
340 { | 340 { |