Mercurial > sdl-ios-xcode

diff src/cdrom/qnx/SDL_syscdrom.c @ 1336:3692456e7b0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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/cdrom/qnx/SDL_syscdrom.c	Mon Feb 06 17:28:04 2006 +0000
+++ b/src/cdrom/qnx/SDL_syscdrom.c	Tue Feb 07 06:59:48 2006 +0000
@@ -128,13 +128,13 @@
         /* Add this drive to our list */
 
         i = SDL_numcds;
-        SDL_cdlist[i] = (char *)malloc(strlen(drive)+1);
+        SDL_cdlist[i] = (char *)SDL_malloc(SDL_strlen(drive)+1);
         if (SDL_cdlist[i] == NULL)
         {
             SDL_OutOfMemory();
             return;
         }
-        strcpy(SDL_cdlist[i], drive);
+        SDL_strcpy(SDL_cdlist[i], drive);
         SDL_cdmode[i] = stbuf->st_rdev;
         ++SDL_numcds;
     }
@@ -169,18 +169,18 @@
     }
 
     /* Look in the environment for our CD-ROM drive list */
-    SDLcdrom = getenv("SDL_CDROM");	/* ':' separated list of devices */
+    SDLcdrom = SDL_getenv("SDL_CDROM");	/* ':' separated list of devices */
     if ( SDLcdrom != NULL )
     {
         char *cdpath, *delim;
 
-        cdpath = malloc(strlen(SDLcdrom)+1);
+        cdpath = SDL_malloc(SDL_strlen(SDLcdrom)+1);
         if (cdpath != NULL)
         {
-            strcpy(cdpath, SDLcdrom);
+            SDL_strcpy(cdpath, SDLcdrom);
             SDLcdrom = cdpath;
             do {
-                delim = strchr(SDLcdrom, ':');
+                delim = SDL_strchr(SDLcdrom, ':');
                 if (delim)
                 {
                     *delim++ = '\0';
@@ -198,7 +198,7 @@
                     SDLcdrom = NULL;
                 }
             } while (SDLcdrom);
-            free(cdpath);
+            SDL_free(cdpath);
         }
 
         /* If we found our drives, there's nothing left to do */
@@ -219,7 +219,7 @@
             for ( j=checklist[i][1]; exists; ++j )
             {
                 sprintf(drive, "/dev/%s", &checklist[i][3]);
-                insert = strchr(drive, '?');
+                insert = SDL_strchr(drive, '?');
                 if (insert != NULL)
                 {
                     *insert = j;
@@ -346,7 +346,7 @@
 
     /* if media exists, then do other stuff */
 
-    memset(&info, 0x00, sizeof(info));
+    SDL_memset(&info, 0x00, sizeof(info));
     info.subch_command.data_format = CDROM_SUBCH_CURRENT_POSITION;
 
     do {
@@ -544,7 +544,7 @@
     {
         for (i=0; i<SDL_numcds; ++i)
         {
-            free(SDL_cdlist[i]);
+            SDL_free(SDL_cdlist[i]);
         }
         SDL_numcds = 0;
     }