summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEn-Shuo Hsu <enshuo@chromium.org>2020-05-21 16:23:08 +0800
committerCommit Bot <commit-bot@chromium.org>2020-05-26 07:10:08 +0000
commit2dff6fee9cf41a22b0859c69a2b567ae55f7f6a8 (patch)
treedb6835f1b9ccd9cddd7dca113a8c666807467dfe
parent39db28c065e6643937db49a106a5598af0518e83 (diff)
downloadadhd-2dff6fee9cf41a22b0859c69a2b567ae55f7f6a8.tar.gz
CRAS: Fix inconsistent signature for cras_server_metrics.h
cras_server_metrics_missed_cb_event should take non const cras_rstream instead of a const one. BUG=None TEST=run unittest Change-Id: Ic8c5e9f4b4802f920b8135c9650ecb64f426eac1 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/2211801 Tested-by: En-Shuo Hsu <enshuo@chromium.org> Auto-Submit: En-Shuo Hsu <enshuo@chromium.org> Reviewed-by: Hsinyu Chao <hychao@chromium.org> Reviewed-by: Yu-Hsuan Hsu <yuhsuan@chromium.org> Commit-Queue: En-Shuo Hsu <enshuo@chromium.org>
-rw-r--r--cras/src/server/cras_server_metrics.c1
-rw-r--r--cras/src/server/cras_server_metrics.h2
-rw-r--r--cras/src/tests/dev_stream_unittest.cc2
-rw-r--r--cras/src/tests/metrics_stub.cc2
4 files changed, 4 insertions, 3 deletions
diff --git a/cras/src/server/cras_server_metrics.c b/cras/src/server/cras_server_metrics.c
index c8249f82..6d37f7d5 100644
--- a/cras/src/server/cras_server_metrics.c
+++ b/cras/src/server/cras_server_metrics.c
@@ -16,6 +16,7 @@
#include "cras_metrics.h"
#include "cras_main_message.h"
#include "cras_rstream.h"
+#include "cras_server_metrics.h"
#include "cras_system_state.h"
#define METRICS_NAME_BUFFER_SIZE 100
diff --git a/cras/src/server/cras_server_metrics.h b/cras/src/server/cras_server_metrics.h
index fab0fd55..d81238b5 100644
--- a/cras/src/server/cras_server_metrics.h
+++ b/cras/src/server/cras_server_metrics.h
@@ -49,7 +49,7 @@ int cras_server_metrics_longest_fetch_delay(unsigned delay_msec);
int cras_server_metrics_num_underruns(unsigned num_underruns);
/* Logs the missed callback event. */
-int cras_server_metrics_missed_cb_event(const struct cras_rstream *stream);
+int cras_server_metrics_missed_cb_event(struct cras_rstream *stream);
/* Logs information when a stream creates. */
int cras_server_metrics_stream_create(const struct cras_rstream_config *config);
diff --git a/cras/src/tests/dev_stream_unittest.cc b/cras/src/tests/dev_stream_unittest.cc
index 96b99912..9210021e 100644
--- a/cras/src/tests/dev_stream_unittest.cc
+++ b/cras/src/tests/dev_stream_unittest.cc
@@ -1296,7 +1296,7 @@ int cras_rstream_flush_old_audio_messages(struct cras_rstream* stream) {
return 0;
}
-int cras_server_metrics_missed_cb_event(const struct cras_rstream* stream) {
+int cras_server_metrics_missed_cb_event(struct cras_rstream* stream) {
cras_server_metrics_missed_cb_event_called++;
return 0;
}
diff --git a/cras/src/tests/metrics_stub.cc b/cras/src/tests/metrics_stub.cc
index 8376e9cd..73998645 100644
--- a/cras/src/tests/metrics_stub.cc
+++ b/cras/src/tests/metrics_stub.cc
@@ -26,7 +26,7 @@ int cras_server_metrics_longest_fetch_delay(unsigned delay_msec) {
return 0;
}
-int cras_server_metrics_missed_cb_event(const struct cras_rstream* stream) {
+int cras_server_metrics_missed_cb_event(struct cras_rstream* stream) {
return 0;
}