From 54c4a6c6105c8c332795c7c38f5595437701e01f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 6 Jan 1999 15:25:15 +0000 Subject: [PATCH] Fixed for fcntl calls (NONBLOCK)... --- src/pcm/pcm.c | 4 ++-- src/pcm/pcm_loopback.c | 4 ++-- src/rawmidi/rawmidi.c | 4 ++-- src/seq/seq.c | 4 ++-- test/Makefile.am | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index dec1bef2..7b1edf8d 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -100,13 +100,13 @@ int snd_pcm_block_mode(void *handle, int enable) pcm = (snd_pcm_t *) handle; if (!pcm) return -EINVAL; - if (fcntl(pcm->fd, F_GETFL, &flags) < 0) + if ((flags = fcntl(pcm->fd, F_GETFL)) < 0) return -errno; if (enable) flags |= O_NONBLOCK; else flags &= ~O_NONBLOCK; - if (fcntl(pcm->fd, F_SETFL, &flags) < 0) + if (fcntl(pcm->fd, F_SETFL, flags) < 0) return -errno; return 0; } diff --git a/src/pcm/pcm_loopback.c b/src/pcm/pcm_loopback.c index 4a285ece..d4b2c457 100644 --- a/src/pcm/pcm_loopback.c +++ b/src/pcm/pcm_loopback.c @@ -101,13 +101,13 @@ int snd_pcm_loopback_block_mode(void *handle, int enable) lb = (snd_pcm_loopback_t *) handle; if (!lb) return -EINVAL; - if (fcntl(lb->fd, F_GETFL, &flags) < 0) + if ((flags = fcntl(lb->fd, F_GETFL)) < 0) return -errno; if (enable) flags |= O_NONBLOCK; else flags &= ~O_NONBLOCK; - if (fcntl(lb->fd, F_SETFL, &flags) < 0) + if (fcntl(lb->fd, F_SETFL, flags) < 0) return -errno; return 0; } diff --git a/src/rawmidi/rawmidi.c b/src/rawmidi/rawmidi.c index cfeedf2c..f882a711 100644 --- a/src/rawmidi/rawmidi.c +++ b/src/rawmidi/rawmidi.c @@ -100,13 +100,13 @@ int snd_rawmidi_block_mode(void *handle, int enable) rmidi = (snd_rawmidi_t *) handle; if (!rmidi) return -EINVAL; - if (fcntl(rmidi->fd, F_GETFL, &flags) < 0) + if ((flags = fcntl(rmidi->fd, F_GETFL)) < 0) return -errno; if (enable) flags |= O_NONBLOCK; else flags &= ~O_NONBLOCK; - if (fcntl(rmidi->fd, F_SETFL, &flags) < 0) + if (fcntl(rmidi->fd, F_SETFL, flags) < 0) return -errno; return 0; } diff --git a/src/seq/seq.c b/src/seq/seq.c index d3e3c1b0..8a053985 100644 --- a/src/seq/seq.c +++ b/src/seq/seq.c @@ -134,13 +134,13 @@ int snd_seq_block_mode(void *handle, int enable) seq = (snd_seq_t *) handle; if (!seq) return -EINVAL; - if (fcntl(seq->fd, F_GETFL, &flags) < 0) + if ((flags = fcntl(seq->fd, F_GETFL)) < 0) return -errno; if (enable) flags |= O_NONBLOCK; else flags &= ~O_NONBLOCK; - if (fcntl(seq->fd, F_SETFL, &flags) < 0) + if (fcntl(seq->fd, F_SETFL, flags) < 0) return -errno; return 0; } diff --git a/test/Makefile.am b/test/Makefile.am index e48bb0d8..e4a851ad 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -11,3 +11,4 @@ seq_LDADD=../src/libasound.la INCLUDES=-I$(top_srcdir)/include CFLAGS=-static -Wall -pipe -g +EXTRA_DIST=seq-decoder.c seq-sender.c -- 2.11.0