From ddd2881fdd57d23a87b0761ea2d5b2676390d63e Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 2 Sep 2024 21:06:01 +0200 Subject: [PATCH] epgview.cpp: Fix warning about ignored 'nodiscard' attribute in show method Changed the for-loop in the show method of CEpgData class to properly check both conditions using the logical AND operator. This should ensure that the return value of 'operator!=' is not ignored, which addresses the compiler warning about the 'nodiscard' [-Wunused-result]. - Replaced ',' with '&&' in the loop condition. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d2d82e4b22bd4399364dc3cde53c78f5790eac30 Author: Thilo Graf Date: 2024-09-02 (Mon, 02 Sep 2024) ------------------ This commit was generated by Migit --- src/gui/epgview.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index dfdf512c9..e6477f9bd 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -827,11 +827,12 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start // 21.07.2005 - rainerk // Show extended information - if ( !epgData.itemDescriptions.empty() && !epgData.items.empty()) { + if (!epgData.itemDescriptions.empty() && !epgData.items.empty()) { char line[256]; std::vector::iterator description; std::vector::iterator item; - for (description = epgData.itemDescriptions.begin(), item = epgData.items.begin(); description != epgData.itemDescriptions.end(), item != epgData.items.end(); ++description, ++item) { + for (description = epgData.itemDescriptions.begin(), item = epgData.items.begin(); description != epgData.itemDescriptions.end() && item != epgData.items.end(); ++description, ++item) + { sprintf(line, "%s: %s", (*(description)).c_str(), (*(item)).c_str()); processTextToArray(line); }