[pulseaudio-discuss] [PATCH] shm: Wrap memfd-specific code in relevant ifdef

Tanu Kaskinen tanuk at iki.fi
Wed Aug 10 16:51:29 UTC 2016


On Wed, 2016-08-10 at 21:44 +0530, Arun Raghavan wrote:
> Doesn't really affect logic, but Coverity reports this as dead-code, and
> I figure it makes sense to be consistent about our use of HAVE_MEMFD.
> 
> CID: 1352045
> ---
>  src/pulsecore/shm.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c
> index 9dea0a5..8bd7ed7 100644
> --- a/src/pulsecore/shm.c
> +++ b/src/pulsecore/shm.c
> @@ -201,12 +201,14 @@ static int sharedmem_create(pa_shm *m, pa_mem_type_t type, size_t size, mode_t m
>  
>      /* For memfds, we keep the fd open until we pass it
>       * to the other PA endpoint over unix domain socket. */
> -    if (type == PA_MEM_TYPE_SHARED_MEMFD)
> -        m->fd = fd;
> -    else {
> +    if (type != PA_MEM_TYPE_SHARED_MEMFD) {
>          pa_assert_se(pa_close(fd) == 0);
>          m->fd = -1;
>      }
> +#if HAVE_MEMFD
> +    else
> +        m->fd = fd;
> +#endif
>  
>      return 0;

Looks good to me.

-- 
Tanu


More information about the pulseaudio-discuss mailing list