[alsa-devel] [PATCH] alsa-utils: fix pcm_read() return value
Because of the way the pcm_read() functions are currently used, returning rcount or result is equivalent but I feel it is more accurate to return 'result'.
Signed-off-by: Olivier Langlois olivier@trillion01.com --- aplay/aplay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/aplay/aplay.c b/aplay/aplay.c index e0631c4..69e8bda 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -2039,7 +2039,7 @@ static ssize_t pcm_read(u_char *data, size_t rcount) data += r * bits_per_frame / 8; } } - return rcount; + return result; }
static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount) @@ -2084,7 +2084,7 @@ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount) count -= r; } } - return rcount; + return result; }
/*
At Tue, 7 Jan 2014 23:18:17 -0500, Olivier Langlois wrote:
Because of the way the pcm_read() functions are currently used, returning rcount or result is equivalent but I feel it is more accurate to return 'result'.
Signed-off-by: Olivier Langlois olivier@trillion01.com
Thanks, applied.
Takashi
aplay/aplay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/aplay/aplay.c b/aplay/aplay.c index e0631c4..69e8bda 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -2039,7 +2039,7 @@ static ssize_t pcm_read(u_char *data, size_t rcount) data += r * bits_per_frame / 8; } }
- return rcount;
- return result;
}
static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount) @@ -2084,7 +2084,7 @@ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount) count -= r; } }
- return rcount;
- return result;
}
/*
1.8.5.2
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
participants (2)
-
Olivier Langlois -
Takashi Iwai