From ff9309595a046512269302e98a3859bb3941f6ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Fri, 3 Feb 2023 14:05:05 -0500 Subject: [PATCH] Build fix: consumer: unused-but-set-variable warning MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit clang 15.0.7 produces the following warning, preventing the build of the project with -Werror: consumer/consumer.cpp:2519:15: error: variable 'num_hup' set but not used [-Werror,-Wunused-but-set-variable] int num_rdy, num_hup, high_prio, ret, i, err = -1; ^ num_hup is indeed not used, so remove its declaration and its assignations. Signed-off-by: Jérémie Galarneau Change-Id: Iccd8aa7716602d6babd1ed5aa23d06268385480c --- src/common/consumer/consumer.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/common/consumer/consumer.cpp b/src/common/consumer/consumer.cpp index 27b34a39f..5f3dc4e62 100644 --- a/src/common/consumer/consumer.cpp +++ b/src/common/consumer/consumer.cpp @@ -2516,7 +2516,7 @@ error_testpoint: */ void *consumer_thread_data_poll(void *data) { - int num_rdy, num_hup, high_prio, ret, i, err = -1; + int num_rdy, high_prio, ret, i, err = -1; struct pollfd *pollfd = nullptr; /* local view of the streams */ struct lttng_consumer_stream **local_stream = nullptr, *new_stream = nullptr; @@ -2549,7 +2549,6 @@ void *consumer_thread_data_poll(void *data) health_code_update(); high_prio = 0; - num_hup = 0; /* * the fds set has been updated, we need to update our @@ -2765,21 +2764,18 @@ void *consumer_thread_data_poll(void *data) if (!local_stream[i]->has_data_left_to_be_read_before_teardown) { consumer_del_stream(local_stream[i], data_ht); local_stream[i] = nullptr; - num_hup++; } } else if (pollfd[i].revents & POLLERR) { ERR("Error returned in polling fd %d.", pollfd[i].fd); if (!local_stream[i]->has_data_left_to_be_read_before_teardown) { consumer_del_stream(local_stream[i], data_ht); local_stream[i] = nullptr; - num_hup++; } } else if (pollfd[i].revents & POLLNVAL) { ERR("Polling fd %d tells fd is not open.", pollfd[i].fd); if (!local_stream[i]->has_data_left_to_be_read_before_teardown) { consumer_del_stream(local_stream[i], data_ht); local_stream[i] = nullptr; - num_hup++; } } if (local_stream[i] != nullptr) { -- 2.34.1