From 29f9743e15cf85bf5513d459683362f8eb1fd5b1 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 2 Sep 2024 21:06:01 +0200 Subject: [PATCH] lcd4l.cpp: Fix format warnings - Corrected the format specifiers in snprintf calls to match the data types of the arguments. - Used PRId64 for int64_t types to ensure compatibility across different platforms. - Added explicit type casting to int64_t for time_t variables to resolve mismatched format warnings. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6370dc8185bb1ae2b1947166f648aec4d522ae8b Author: Thilo Graf Date: 2024-09-02 (Mon, 02 Sep 2024) Origin message was: ------------------ lcd4l.cpp: Fix format warnings - Corrected the format specifiers in snprintf calls to match the data types of the arguments. - Used PRId64 for int64_t types to ensure compatibility across different platforms. - Added explicit type casting to int64_t for time_t variables to resolve mismatched format warnings. ------------------ This commit was generated by Migit --- src/driver/lcd4l.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp index c833e2b70..ae92bca43 100644 --- a/src/driver/lcd4l.cpp +++ b/src/driver/lcd4l.cpp @@ -576,7 +576,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) std::string DolbyDigital; if ((g_RemoteControl->current_PIDs.PIDs.selected_apid < g_RemoteControl->current_PIDs.APIDs.size()) && - (g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].is_ac3)) + (g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].is_ac3)) DolbyDigital = "yes"; else DolbyDigital = g_RemoteControl->has_ac3 ? "available" : "no"; @@ -763,9 +763,9 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) Service = g_RemoteControl->getCurrentChannelName(); /* - "moviebrowser_moviecut" is special. - It signals the active moviebrowser with the moviebrowser logo, - but handles the rest of the lcd as in tv/radio mode. + "moviebrowser_moviecut" is special. + It signals the active moviebrowser with the moviebrowser logo, + but handles the rest of the lcd as in tv/radio mode. */ if (m_ActionKey == "moviebrowser_moviecut") @@ -1090,11 +1090,11 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) { Progress = 100 * done / total; - snprintf(Duration, sizeof(Duration), "%ld:%02ld/%ld:%02ld\n%ld:%02ld\n%ld:%02ld\n%ld:%02ld", - done / 60, done % 60, total / 60, total % 60, - done / 60, done % 60, - todo / 60, todo % 60, - total / 60, total % 60); + snprintf(Duration, sizeof(Duration), "%" PRId64 ":%02" PRId64 "/%" PRId64 ":%02" PRId64 "\n%" PRId64 ":%02" PRId64 "\n%" PRId64 ":%02" PRId64 "\n%" PRId64 ":%02" PRId64, + (int64_t)(done / 60), (int64_t)(done % 60), (int64_t)(total / 60), (int64_t)(total % 60), + (int64_t)(done / 60), (int64_t)(done % 60), + (int64_t)(todo / 60), (int64_t)(todo % 60), + (int64_t)(total / 60), (int64_t)(total % 60)); } } @@ -1272,6 +1272,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) } } + /* ----------------------------------------------------------------- */ bool CLCD4l::WriteFile(const char *file, std::string content, bool convert)