asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-12-23 04:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

bat: Don't pass incompatible function pointers to pthread_cleanup_push()

Browse source 
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>
This commit is contained in:
Takashi Iwai 2015-11-09 14:09:50 +01:00
parent 3bf8e79c3b
commit ed0cce1b60
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bat/alsa.c
View file

@ -505,6 +505,16 @@ static int read_from_pcm_loop(FILE *fp, int count,
return 0; return 0;
} }
static void pcm_cleanup(void *p)
{
snd_pcm_close(p);
}
static void file_cleanup(void *p)
{
fclose(p);
}
/** /**
* Record * Record
*/ */
@ -557,9 +567,9 @@ void *record_alsa(struct bat *bat)
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, 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(free, sndpcm.buffer);
pthread_cleanup_push(fclose, fp); pthread_cleanup_push(file_cleanup, fp);
err = write_wav_header(fp, &wav, bat); err = write_wav_header(fp, &wav, bat);
if (err != 0) { if (err != 0) {