mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix wrong return values in direct plugins

Browse source 
Fixed the codes returning error values that are not set properly
via errno.
This commit is contained in:
Takashi Iwai 2007-11-16 12:06:43 +01:00
parent c13b8dc986
commit 408af4b675
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pcm/pcm_direct.c
View file

@ -109,13 +109,15 @@ retryget:
} }
dmix->shmptr = shmat(dmix->shmid, 0, 0); dmix->shmptr = shmat(dmix->shmid, 0, 0);
if (dmix->shmptr == (void *) -1) { if (dmix->shmptr == (void *) -1) {
err = -errno;
snd_pcm_direct_shm_discard(dmix); snd_pcm_direct_shm_discard(dmix);
return -errno; return err;
} }
mlock(dmix->shmptr, sizeof(snd_pcm_direct_share_t)); mlock(dmix->shmptr, sizeof(snd_pcm_direct_share_t));
if (shmctl(dmix->shmid, IPC_STAT, &buf) < 0) { if (shmctl(dmix->shmid, IPC_STAT, &buf) < 0) {
err = -errno;
snd_pcm_direct_shm_discard(dmix); snd_pcm_direct_shm_discard(dmix);
return -errno; return err;
} }
if (buf.shm_nattch == 1) { /* we're the first user, clear the segment */ if (buf.shm_nattch == 1) { /* we're the first user, clear the segment */
memset(dmix->shmptr, 0, sizeof(snd_pcm_direct_share_t)); memset(dmix->shmptr, 0, sizeof(snd_pcm_direct_share_t));
@ -128,7 +130,7 @@ retryget:
} else { } else {
if (dmix->shmptr->magic != SND_PCM_DIRECT_MAGIC) { if (dmix->shmptr->magic != SND_PCM_DIRECT_MAGIC) {
snd_pcm_direct_shm_discard(dmix); snd_pcm_direct_shm_discard(dmix);
return -errno; return -EINVAL;
} }
} }
return 0; return 0;