shithub: sox

Info  •  Files  •  Log  •  Branches

Fix compile error in oss.c

Depending on the implementation of fileno(), it doesn't accept a void
pointer as its argument. This could make the compiler fail.

Reported by Hans Petter Selasky in tracker item 3587421.

--- a/src/oss.c

+++ b/src/oss.c

@@ -56,6 +56,7 @@

     int sampletype, samplesize, dsp_stereo;

     int tmp, rc;

     priv_t *file = (priv_t *)ft->priv;

+    int fn = fileno((FILE *)(ft->fp));

     if (ft->encoding.bits_per_sample == 8) {

         sampletype = AFMT_U8;

@@ -113,7 +114,7 @@

     if (ft->signal.channels > 2) ft->signal.channels = 2;

-    if (ioctl(fileno(ft->fp), (size_t) SNDCTL_DSP_RESET, 0) < 0)

+    if (ioctl(fn, (size_t) SNDCTL_DSP_RESET, 0) < 0)

     {

         lsx_fail_errno(ft,SOX_EOF,"Unable to reset OSS driver.  Possibly accessing an invalid file/device");

         return(SOX_EOF);

@@ -121,7 +122,7 @@

     /* Query the supported formats and find the best match

      */

-    rc = ioctl(fileno(ft->fp), SNDCTL_DSP_GETFMTS, &tmp);

+    rc = ioctl(fn, SNDCTL_DSP_GETFMTS, &tmp);

     if (rc == 0) {

         if ((tmp & sampletype) == 0)

         {

@@ -160,7 +161,7 @@

         }

         tmp = sampletype;

-        rc = ioctl(fileno(ft->fp), SNDCTL_DSP_SETFMT, &tmp);

+        rc = ioctl(fn, SNDCTL_DSP_SETFMT, &tmp);

     }

     /* Give up and exit */

     if (rc < 0 || tmp != sampletype)

@@ -173,7 +174,7 @@

     else dsp_stereo = 0;

     tmp = dsp_stereo;

-    if (ioctl(fileno(ft->fp), SNDCTL_DSP_STEREO, &tmp) < 0)

+    if (ioctl(fn, SNDCTL_DSP_STEREO, &tmp) < 0)

     {

         lsx_warn("Couldn't set to %s", dsp_stereo?  "stereo":"mono");

         dsp_stereo = 0;

@@ -183,7 +184,7 @@

         ft->signal.channels = tmp + 1;

     tmp = ft->signal.rate;

-    if (ioctl (fileno(ft->fp), SNDCTL_DSP_SPEED, &tmp) < 0 ||

+    if (ioctl(fn, SNDCTL_DSP_SPEED, &tmp) < 0 ||

         (int)ft->signal.rate != tmp) {

         /* If the rate the sound card is using is not within 1% of what

          * the user specified then override the user setting.

@@ -202,7 +203,7 @@

      * its size based on specific rates/formats.

      */

     file->size = 0;

-    ioctl (fileno(ft->fp), SNDCTL_DSP_GETBLKSIZE, &file->size);

+    ioctl(fn, SNDCTL_DSP_GETBLKSIZE, &file->size);

     if (file->size < 4 || file->size > 65536) {

             lsx_fail_errno(ft,SOX_EOF,"Invalid audio buffer size %" PRIuPTR, file->size);

             return (SOX_EOF);

@@ -211,7 +212,7 @@

     file->pos = 0;

     file->buf = lsx_malloc(file->size);

-    if (ioctl(fileno(ft->fp), (size_t) SNDCTL_DSP_SYNC, NULL) < 0) {

+    if (ioctl(fn, (size_t) SNDCTL_DSP_SYNC, NULL) < 0) {

         lsx_fail_errno(ft,SOX_EOF,"Unable to sync dsp");

         return (SOX_EOF);

     }