--- a/src/cdrom/freebsd/SDL_syscdrom.c	Mon May 29 03:53:21 2006 +0000
+++ b/src/cdrom/freebsd/SDL_syscdrom.c	Mon May 29 04:04:35 2006 +0000
@@ -44,16 +44,16 @@
 static dev_t SDL_cdmode[MAX_DRIVES];
 
 /* The system-dependent CD control functions */
-static const char *SDL_SYS_CDName (int drive);
-static int SDL_SYS_CDOpen (int drive);
-static int SDL_SYS_CDGetTOC (SDL_CD * cdrom);
-static CDstatus SDL_SYS_CDStatus (SDL_CD * cdrom, int *position);
-static int SDL_SYS_CDPlay (SDL_CD * cdrom, int start, int length);
-static int SDL_SYS_CDPause (SDL_CD * cdrom);
-static int SDL_SYS_CDResume (SDL_CD * cdrom);
-static int SDL_SYS_CDStop (SDL_CD * cdrom);
-static int SDL_SYS_CDEject (SDL_CD * cdrom);
-static void SDL_SYS_CDClose (SDL_CD * cdrom);
+static const char *SDL_SYS_CDName(int drive);
+static int SDL_SYS_CDOpen(int drive);
+static int SDL_SYS_CDGetTOC(SDL_CD * cdrom);
+static CDstatus SDL_SYS_CDStatus(SDL_CD * cdrom, int *position);
+static int SDL_SYS_CDPlay(SDL_CD * cdrom, int start, int length);
+static int SDL_SYS_CDPause(SDL_CD * cdrom);
+static int SDL_SYS_CDResume(SDL_CD * cdrom);
+static int SDL_SYS_CDStop(SDL_CD * cdrom);
+static int SDL_SYS_CDEject(SDL_CD * cdrom);
+static void SDL_SYS_CDClose(SDL_CD * cdrom);
 
 /* Some ioctl() errno values which occur when the tray is empty */
 #define ERRNO_TRAYEMPTY(errno)	\
@@ -61,20 +61,20 @@
 
 /* Check a drive to see if it is a CD-ROM */
 static int
-CheckDrive (char *drive, struct stat *stbuf)
+CheckDrive(char *drive, struct stat *stbuf)
 {
     int is_cd, cdfd;
     struct ioc_read_subchannel info;
 
     /* If it doesn't exist, return -1 */
-    if (stat (drive, stbuf) < 0) {
+    if (stat(drive, stbuf) < 0) {
         return (-1);
     }
 
     /* If it does exist, verify that it's an available CD-ROM */
     is_cd = 0;
-    if (S_ISCHR (stbuf->st_mode) || S_ISBLK (stbuf->st_mode)) {
-        cdfd = open (drive, (O_RDONLY | O_EXCL | O_NONBLOCK), 0);
+    if (S_ISCHR(stbuf->st_mode) || S_ISBLK(stbuf->st_mode)) {
+        cdfd = open(drive, (O_RDONLY | O_EXCL | O_NONBLOCK), 0);
         if (cdfd >= 0) {
             info.address_format = CD_MSF_FORMAT;
             info.data_format = CD_CURRENT_POSITION;
@@ -84,11 +84,11 @@
                This isn't 100% reliable, so we use the USE_MNTENT
                code above instead.
              */
-            if ((ioctl (cdfd, CDIOCREADSUBCHANNEL, &info) == 0) ||
-                ERRNO_TRAYEMPTY (errno)) {
+            if ((ioctl(cdfd, CDIOCREADSUBCHANNEL, &info) == 0) ||
+                ERRNO_TRAYEMPTY(errno)) {
                 is_cd = 1;
             }
-            close (cdfd);
+            close(cdfd);
         }
     }
     return (is_cd);
@@ -96,7 +96,7 @@
 
 /* Add a CD-ROM drive to our list of valid drives */
 static void
-AddDrive (char *drive, struct stat *stbuf)
+AddDrive(char *drive, struct stat *stbuf)
 {
     int i;
 
@@ -107,8 +107,8 @@
         for (i = 0; i < SDL_numcds; ++i) {
             if (stbuf->st_rdev == SDL_cdmode[i]) {
 #ifdef DEBUG_CDROM
-                fprintf (stderr, "Duplicate drive detected: %s == %s\n",
-                         drive, SDL_cdlist[i]);
+                fprintf(stderr, "Duplicate drive detected: %s == %s\n",
+                        drive, SDL_cdlist[i]);
 #endif
                 return;
             }
@@ -116,21 +116,21 @@
 
         /* Add this drive to our list */
         i = SDL_numcds;
-        SDL_cdlist[i] = SDL_strdup (drive);
+        SDL_cdlist[i] = SDL_strdup(drive);
         if (SDL_cdlist[i] == NULL) {
-            SDL_OutOfMemory ();
+            SDL_OutOfMemory();
             return;
         }
         SDL_cdmode[i] = stbuf->st_rdev;
         ++SDL_numcds;
 #ifdef DEBUG_CDROM
-        fprintf (stderr, "Added CD-ROM drive: %s\n", drive);
+        fprintf(stderr, "Added CD-ROM drive: %s\n", drive);
 #endif
     }
 }
 
 int
-SDL_SYS_CDInit (void)
+SDL_SYS_CDInit(void)
 {
     /* checklist: /dev/cdrom,/dev/cd?c /dev/acd?c
        /dev/matcd?c /dev/mcd?c /dev/scd?c */
@@ -155,21 +155,21 @@
     SDL_CDcaps.Close = SDL_SYS_CDClose;
 
     /* Look in the environment for our CD-ROM drive list */
-    SDLcdrom = SDL_getenv ("SDL_CDROM");        /* ':' separated list of devices */
+    SDLcdrom = SDL_getenv("SDL_CDROM"); /* ':' separated list of devices */
     if (SDLcdrom != NULL) {
         char *cdpath, *delim;
-        size_t len = SDL_strlen (SDLcdrom) + 1;
-        cdpath = SDL_stack_alloc (char, len);
+        size_t len = SDL_strlen(SDLcdrom) + 1;
+        cdpath = SDL_stack_alloc(char, len);
         if (cdpath != NULL) {
-            SDL_strlcpy (cdpath, SDLcdrom, len);
+            SDL_strlcpy(cdpath, SDLcdrom, len);
             SDLcdrom = cdpath;
             do {
-                delim = SDL_strchr (SDLcdrom, ':');
+                delim = SDL_strchr(SDLcdrom, ':');
                 if (delim) {
                     *delim++ = '\0';
                 }
-                if (CheckDrive (SDLcdrom, &stbuf) > 0) {
-                    AddDrive (SDLcdrom, &stbuf);
+                if (CheckDrive(SDLcdrom, &stbuf) > 0) {
+                    AddDrive(SDLcdrom, &stbuf);
                 }
                 if (delim) {
                     SDLcdrom = delim;
@@ -178,7 +178,7 @@
                 }
             }
             while (SDLcdrom);
-            SDL_stack_free (cdpath);
+            SDL_stack_free(cdpath);
         }
 
         /* If we found our drives, there's nothing left to do */
@@ -193,16 +193,16 @@
             char *insert;
             exists = 1;
             for (j = checklist[i][1]; exists; ++j) {
-                SDL_snprintf (drive, SDL_arraysize (drive), "/dev/%sc",
-                              &checklist[i][3]);
-                insert = SDL_strchr (drive, '?');
+                SDL_snprintf(drive, SDL_arraysize(drive), "/dev/%sc",
+                             &checklist[i][3]);
+                insert = SDL_strchr(drive, '?');
                 if (insert != NULL) {
                     *insert = j;
                 }
-                switch (CheckDrive (drive, &stbuf)) {
+                switch (CheckDrive(drive, &stbuf)) {
                     /* Drive exists and is a CD-ROM */
                 case 1:
-                    AddDrive (drive, &stbuf);
+                    AddDrive(drive, &stbuf);
                     break;
                     /* Drive exists, but isn't a CD-ROM */
                 case 0:
@@ -214,10 +214,10 @@
                 }
             }
         } else {
-            SDL_snprintf (drive, SDL_arraysize (drive), "/dev/%s",
-                          checklist[i]);
-            if (CheckDrive (drive, &stbuf) > 0) {
-                AddDrive (drive, &stbuf);
+            SDL_snprintf(drive, SDL_arraysize(drive), "/dev/%s",
+                         checklist[i]);
+            if (CheckDrive(drive, &stbuf) > 0) {
+                AddDrive(drive, &stbuf);
             }
         }
     }
@@ -226,31 +226,31 @@
 
 /* General ioctl() CD-ROM command function */
 static int
-SDL_SYS_CDioctl (int id, int command, void *arg)
+SDL_SYS_CDioctl(int id, int command, void *arg)
 {
     int retval;
 
-    retval = ioctl (id, command, arg);
+    retval = ioctl(id, command, arg);
     if (retval < 0) {
-        SDL_SetError ("ioctl() error: %s", strerror (errno));
+        SDL_SetError("ioctl() error: %s", strerror(errno));
     }
     return (retval);
 }
 
 static const char *
-SDL_SYS_CDName (int drive)
+SDL_SYS_CDName(int drive)
 {
     return (SDL_cdlist[drive]);
 }
 
 static int
-SDL_SYS_CDOpen (int drive)
+SDL_SYS_CDOpen(int drive)
 {
-    return (open (SDL_cdlist[drive], (O_RDONLY | O_EXCL | O_NONBLOCK), 0));
+    return (open(SDL_cdlist[drive], (O_RDONLY | O_EXCL | O_NONBLOCK), 0));
 }
 
 static int
-SDL_SYS_CDGetTOC (SDL_CD * cdrom)
+SDL_SYS_CDGetTOC(SDL_CD * cdrom)
 {
     struct ioc_toc_header toc;
     int i, okay;
@@ -258,7 +258,7 @@
     struct cd_toc_entry data;
 
     okay = 0;
-    if (SDL_SYS_CDioctl (cdrom->id, CDIOREADTOCHEADER, &toc) == 0) {
+    if (SDL_SYS_CDioctl(cdrom->id, CDIOREADTOCHEADER, &toc) == 0) {
         cdrom->numtracks = toc.ending_track - toc.starting_track + 1;
         if (cdrom->numtracks > SDL_MAX_TRACKS) {
             cdrom->numtracks = SDL_MAX_TRACKS;
@@ -272,15 +272,15 @@
             }
             entry.starting_track = cdrom->track[i].id;
             entry.address_format = CD_MSF_FORMAT;
-            entry.data_len = sizeof (data);
+            entry.data_len = sizeof(data);
             entry.data = &data;
-            if (SDL_SYS_CDioctl (cdrom->id, CDIOREADTOCENTRYS, &entry) < 0) {
+            if (SDL_SYS_CDioctl(cdrom->id, CDIOREADTOCENTRYS, &entry) < 0) {
                 break;
             } else {
                 cdrom->track[i].type = data.control;
                 cdrom->track[i].offset =
-                    MSF_TO_FRAMES (data.addr.msf.minute,
-                                   data.addr.msf.second, data.addr.msf.frame);
+                    MSF_TO_FRAMES(data.addr.msf.minute,
+                                  data.addr.msf.second, data.addr.msf.frame);
                 cdrom->track[i].length = 0;
                 if (i > 0) {
                     cdrom->track[i - 1].length =
@@ -297,7 +297,7 @@
 
 /* Get CD-ROM status */
 static CDstatus
-SDL_SYS_CDStatus (SDL_CD * cdrom, int *position)
+SDL_SYS_CDStatus(SDL_CD * cdrom, int *position)
 {
     CDstatus status;
     struct ioc_toc_header toc;
@@ -307,10 +307,10 @@
     info.address_format = CD_MSF_FORMAT;
     info.data_format = CD_CURRENT_POSITION;
     info.track = 0;
-    info.data_len = sizeof (data);
+    info.data_len = sizeof(data);
     info.data = &data;
-    if (ioctl (cdrom->id, CDIOCREADSUBCHANNEL, &info) < 0) {
-        if (ERRNO_TRAYEMPTY (errno)) {
+    if (ioctl(cdrom->id, CDIOCREADSUBCHANNEL, &info) < 0) {
+        if (ERRNO_TRAYEMPTY(errno)) {
             status = CD_TRAYEMPTY;
         } else {
             status = CD_ERROR;
@@ -320,7 +320,7 @@
         case CD_AS_AUDIO_INVALID:
         case CD_AS_NO_STATUS:
             /* Try to determine if there's a CD available */
-            if (ioctl (cdrom->id, CDIOREADTOCHEADER, &toc) == 0)
+            if (ioctl(cdrom->id, CDIOREADTOCHEADER, &toc) == 0)
                 status = CD_STOPPED;
             else
                 status = CD_TRAYEMPTY;
@@ -342,9 +342,9 @@
     if (position) {
         if (status == CD_PLAYING || (status == CD_PAUSED)) {
             *position =
-                MSF_TO_FRAMES (data.what.position.absaddr.msf.minute,
-                               data.what.position.absaddr.msf.second,
-                               data.what.position.absaddr.msf.frame);
+                MSF_TO_FRAMES(data.what.position.absaddr.msf.minute,
+                              data.what.position.absaddr.msf.second,
+                              data.what.position.absaddr.msf.frame);
         } else {
             *position = 0;
         }
@@ -354,66 +354,66 @@
 
 /* Start play */
 static int
-SDL_SYS_CDPlay (SDL_CD * cdrom, int start, int length)
+SDL_SYS_CDPlay(SDL_CD * cdrom, int start, int length)
 {
     struct ioc_play_msf playtime;
 
-    FRAMES_TO_MSF (start,
-                   &playtime.start_m, &playtime.start_s, &playtime.start_f);
-    FRAMES_TO_MSF (start + length,
-                   &playtime.end_m, &playtime.end_s, &playtime.end_f);
+    FRAMES_TO_MSF(start,
+                  &playtime.start_m, &playtime.start_s, &playtime.start_f);
+    FRAMES_TO_MSF(start + length,
+                  &playtime.end_m, &playtime.end_s, &playtime.end_f);
 #ifdef DEBUG_CDROM
-    fprintf (stderr, "Trying to play from %d:%d:%d to %d:%d:%d\n",
-             playtime.cdmsf_min0, playtime.cdmsf_sec0, playtime.cdmsf_frame0,
-             playtime.cdmsf_min1, playtime.cdmsf_sec1, playtime.cdmsf_frame1);
+    fprintf(stderr, "Trying to play from %d:%d:%d to %d:%d:%d\n",
+            playtime.cdmsf_min0, playtime.cdmsf_sec0, playtime.cdmsf_frame0,
+            playtime.cdmsf_min1, playtime.cdmsf_sec1, playtime.cdmsf_frame1);
 #endif
-    ioctl (cdrom->id, CDIOCSTART, 0);
-    return (SDL_SYS_CDioctl (cdrom->id, CDIOCPLAYMSF, &playtime));
+    ioctl(cdrom->id, CDIOCSTART, 0);
+    return (SDL_SYS_CDioctl(cdrom->id, CDIOCPLAYMSF, &playtime));
 }
 
 /* Pause play */
 static int
-SDL_SYS_CDPause (SDL_CD * cdrom)
+SDL_SYS_CDPause(SDL_CD * cdrom)
 {
-    return (SDL_SYS_CDioctl (cdrom->id, CDIOCPAUSE, 0));
+    return (SDL_SYS_CDioctl(cdrom->id, CDIOCPAUSE, 0));
 }
 
 /* Resume play */
 static int
-SDL_SYS_CDResume (SDL_CD * cdrom)
+SDL_SYS_CDResume(SDL_CD * cdrom)
 {
-    return (SDL_SYS_CDioctl (cdrom->id, CDIOCRESUME, 0));
+    return (SDL_SYS_CDioctl(cdrom->id, CDIOCRESUME, 0));
 }
 
 /* Stop play */
 static int
-SDL_SYS_CDStop (SDL_CD * cdrom)
+SDL_SYS_CDStop(SDL_CD * cdrom)
 {
-    return (SDL_SYS_CDioctl (cdrom->id, CDIOCSTOP, 0));
+    return (SDL_SYS_CDioctl(cdrom->id, CDIOCSTOP, 0));
 }
 
 /* Eject the CD-ROM */
 static int
-SDL_SYS_CDEject (SDL_CD * cdrom)
+SDL_SYS_CDEject(SDL_CD * cdrom)
 {
-    return (SDL_SYS_CDioctl (cdrom->id, CDIOCEJECT, 0));
+    return (SDL_SYS_CDioctl(cdrom->id, CDIOCEJECT, 0));
 }
 
 /* Close the CD-ROM handle */
 static void
-SDL_SYS_CDClose (SDL_CD * cdrom)
+SDL_SYS_CDClose(SDL_CD * cdrom)
 {
-    close (cdrom->id);
+    close(cdrom->id);
 }
 
 void
-SDL_SYS_CDQuit (void)
+SDL_SYS_CDQuit(void)
 {
     int i;
 
     if (SDL_numcds > 0) {
         for (i = 0; i < SDL_numcds; ++i) {
-            SDL_free (SDL_cdlist[i]);
+            SDL_free(SDL_cdlist[i]);
         }
         SDL_numcds = 0;
     }