[PATCH 1/2] source/sink: Don't let pa_{sink, source}_get_latency_within_thread() return -1 if process_msg() fails

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



None of the callers checks the return value anyway. Return the offset only
if message processing fails. This is in preparation for the next patch.
---
 src/pulsecore/sink.c   | 3 +--
 src/pulsecore/source.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index 39689437..a6a3a2fb 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -1549,8 +1549,7 @@ pa_usec_t pa_sink_get_latency_within_thread(pa_sink *s) {
 
     /* FIXME: We probably should make this a proper vtable callback instead of going through process_msg() */
 
-    if (o->process_msg(o, PA_SINK_MESSAGE_GET_LATENCY, &usec, 0, NULL) < 0)
-        return -1;
+    o->process_msg(o, PA_SINK_MESSAGE_GET_LATENCY, &usec, 0, NULL);
 
     /* usec is unsigned, so check that the offset can be added to usec without
      * underflowing. */
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 14250825..12aa19d1 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -1144,8 +1144,7 @@ pa_usec_t pa_source_get_latency_within_thread(pa_source *s) {
 
     /* FIXME: We probably should make this a proper vtable callback instead of going through process_msg() */
 
-    if (o->process_msg(o, PA_SOURCE_MESSAGE_GET_LATENCY, &usec, 0, NULL) < 0)
-        return -1;
+    o->process_msg(o, PA_SOURCE_MESSAGE_GET_LATENCY, &usec, 0, NULL);
 
     /* usec is unsigned, so check that the offset can be added to usec without
      * underflowing. */
-- 
2.11.0



[Index of Archives]     [Linux Audio Users]     [AMD Graphics]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux