Skip to contentSkip to conversation

alsa-utils: fix pcm_read() return value

PATCH Applied Olivier Langlois 2 participants 2 messages Jan 8, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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'.

---
 aplay/aplay.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
aplay/aplay.c +2 -2
index e0631c4..69e8bda 100644
@@ -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;
 }
 
 /*
Signature · 1 line
1.8.5.2
Applied
#1 lore raw

At Tue, 7 Jan 2014 23:18:17 -0500,

Quoted 6 lines · Olivier Langlois

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'.

Thanks, applied.

Takashi

Quoted 34 lines
---
 aplay/aplay.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
aplay/aplay.c +2 -2
index e0631c4..69e8bda 100644
@@ -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;
 }
 
 /*
Signature · 6 lines
1.8.5.2

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel