]> git.alsa-project.org Git - alsa-utils.git/commitdiff
bat: Don't pass incompatible function pointers to pthread_cleanup_push()
authorTakashi Iwai <tiwai@suse.de>
Mon, 9 Nov 2015 13:09:50 +0000 (14:09 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 9 Nov 2015 13:09:50 +0000 (14:09 +0100)
pthread_cleanup_push() takes a function pointer for void (void *).
Although it may work in most cases, we shouldn't pass an incompatible
function pointer there, as some old gcc complains:
  alsa.c:560: warning: initialization from incompatible pointer type
  alsa.c:562: warning: initialization from incompatible pointer type

Signed-off-by: Takashi Iwai <tiwai@suse.de>
bat/alsa.c

index d31a633cf857141b17bb0ee69c5fd3b8c03ca5d5..5eaa25b6145632cb32a8457c9b783ac7672f91c8 100644 (file)
@@ -505,6 +505,16 @@ static int read_from_pcm_loop(FILE *fp, int count,
        return 0;
 }
 
+static void pcm_cleanup(void *p)
+{
+       snd_pcm_close(p);
+}
+
+static void file_cleanup(void *p)
+{
+       fclose(p);
+}
+
 /**
  * Record
  */
@@ -557,9 +567,9 @@ void *record_alsa(struct bat *bat)
 
        pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
        pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
-       pthread_cleanup_push(snd_pcm_close, sndpcm.handle);
+       pthread_cleanup_push(pcm_cleanup, sndpcm.handle);
        pthread_cleanup_push(free, sndpcm.buffer);
-       pthread_cleanup_push(fclose, fp);
+       pthread_cleanup_push(file_cleanup, fp);
 
        err = write_wav_header(fp, &wav, bat);
        if (err != 0) {