Added strlcat and strlcpy, from OpenBSD. They are smart replacements for strncat...

[xonotic/darkplaces.git] / snd_oss.c

diff --git a/snd_oss.c b/snd_oss.c
index 14fe64efbdfba7a39e2e1e33283724b0e0627c97..9ffb50fee18345f6ce889ea55ae979ef640cba05 100644 (file)
--- a/snd_oss.c
+++ b/snd_oss.c
@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 int audio_fd;
 int snd_inited;
 
-static int tryrates[] = { 11025, 22051, 44100, 8000 };
+static int tryrates[] = {44100, 22051, 11025, 8000};
 
 qboolean SNDDMA_Init(void)
 {
@@ -80,13 +80,13 @@ qboolean SNDDMA_Init(void)
        }
 
        if (ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info)==-1)
-       {   
+       {
                perror("GETOSPACE");
                Con_Printf("Um, can't do GETOSPACE?\n");
                close(audio_fd);
                return 0;
        }
-    
+
        shm = &sn;
        shm->splitbuffer = 0;
 
@@ -113,10 +113,9 @@ qboolean SNDDMA_Init(void)
                shm->speed = atoi(com_argv[i+1]);
        else
        {
-               for (i=0 ; i<sizeof(tryrates)/4 ; i++) {
+               for (i = 0;i < (int) sizeof(tryrates) / 4;i++)
                        if (!ioctl(audio_fd, SNDCTL_DSP_SPEED, &tryrates[i]))
                                break;
-               }
 
                shm->speed = tryrates[i];
     }
@@ -277,3 +276,12 @@ void *S_LockBuffer(void)
 void S_UnlockBuffer(void)
 {
 }
+
+
+void S_Open(void)
+{
+}
+
+void S_Close(void)
+{
+}