mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fdsem: remove superfluous parameter in call to pa_fdsem_new_shm

Browse source 
This parameter was never assigned, so just remove it.

Note that the only current user of this function is shmasyncq.c,
which is unused - we don't even build it. But I fixed it up anyway.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2014-04-15 16:26:12 +02:00
parent 43b6a67fa8
commit 6c42cfe324
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/pulsecore/fdsem.c
View file

@ -100,11 +100,10 @@ pa_fdsem *pa_fdsem_open_shm(pa_fdsem_data *data, int event_fd) {
return f; return f;
} }
pa_fdsem *pa_fdsem_new_shm(pa_fdsem_data *data, int* event_fd) { pa_fdsem *pa_fdsem_new_shm(pa_fdsem_data *data) {
pa_fdsem *f = NULL; pa_fdsem *f = NULL;
pa_assert(data); pa_assert(data);
pa_assert(event_fd);
#ifdef HAVE_SYS_EVENTFD_H #ifdef HAVE_SYS_EVENTFD_H

2
src/pulsecore/fdsem.h
View file

@ -38,7 +38,7 @@ typedef struct pa_fdsem_data {
pa_fdsem *pa_fdsem_new(void); pa_fdsem *pa_fdsem_new(void);
pa_fdsem *pa_fdsem_open_shm(pa_fdsem_data *data, int event_fd); pa_fdsem *pa_fdsem_open_shm(pa_fdsem_data *data, int event_fd);
pa_fdsem *pa_fdsem_new_shm(pa_fdsem_data *data, int* event_fd); pa_fdsem *pa_fdsem_new_shm(pa_fdsem_data *data);
void pa_fdsem_free(pa_fdsem *f); void pa_fdsem_free(pa_fdsem *f);
void pa_fdsem_post(pa_fdsem *f); void pa_fdsem_post(pa_fdsem *f);

3
src/pulsecore/shmasyncq.c
View file

@ -86,10 +86,11 @@ pa_shmasyncq *pa_shmasyncq_new(unsigned n_elements, size_t element_size, void *d
l->data->n_elements = n_elements; l->data->n_elements = n_elements;
l->data->element_size = element_size; l->data->element_size = element_size;
if (!(l->read_fdsem = pa_fdsem_new_shm(&d->read_fdsem_data, &fd[0]))) { if (!(l->read_fdsem = pa_fdsem_new_shm(&d->read_fdsem_data))) {
pa_xfree(l); pa_xfree(l);
return NULL; return NULL;
} }
fd[0] = pa_fdsem_get(l->read_fdsem);
if (!(l->write_fdsem = pa_fdsem_new(&d->write_fdsem_data, &fd[1]))) { if (!(l->write_fdsem = pa_fdsem_new(&d->write_fdsem_data, &fd[1]))) {
pa_fdsem_free(l->read_fdsem); pa_fdsem_free(l->read_fdsem);