mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

timermanager.cpp: Fix format specifiers

Browse Source 
- Changed format specifiers from %ld to %" PRId64 " for `time_t` variables
 to ensure compatibility across different platforms.
- Cast `time_t` variables to `int64_t` for proper formatting.
- Updated printf statements and debug macros accordingly.
- Fixes some translations and code formatting.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c1e257ec5c
Author: Thilo Graf <dbt@novatux.de>
Date: 2024-09-02 (Mon, 02 Sep 2024)

Origin message was:
------------------
timermanager.cpp: Fix format specifiers

- Changed format specifiers from %ld to %" PRId64 " for `time_t` variables
 to ensure compatibility across different platforms.
- Cast `time_t` variables to `int64_t` for proper formatting.
- Updated printf statements and debug macros accordingly.
- Fixes some translations and code formatting.


------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2024-09-02 21:06:01 +02:00
committed by vanhofen
parent 44bac1f304
commit 588d56658b
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/timerd/timermanager.cpp
View File

@@ -747,17 +747,17 @@ void CTimerManager::saveEventsToConfig()
bool CTimerManager::shutdown() bool CTimerManager::shutdown()
{ {
timerd_debug = 1; //FIXME timerd_debug = 1; //FIXME
time_t nextAnnounceTime=0; time_t nextAnnounceTime = 0;
bool status=false; bool status = false;
timer_is_rec = false; timer_is_rec = false;
dprintf("stopping timermanager thread ...\n"); dprintf("stopping timermanager thread ...\n");
dprintf("Waiting for timermanager thread to terminate ...\n"); dprintf("Waiting for timermanager thread to terminate ...\n");
pthread_cancel(thrTimer); pthread_cancel(thrTimer);
pthread_join(thrTimer,NULL); pthread_join(thrTimer, NULL);
dprintf("Timermanager thread terminated\n"); dprintf("Timermanager thread terminated\n");
if(m_saveEvents) if (m_saveEvents)
{ {
dprintf("shutdown: saving config\n"); dprintf("shutdown: saving config\n");
saveEventsToConfig(); saveEventsToConfig();
@@ -771,23 +771,23 @@ bool CTimerManager::shutdown()
} }
CTimerEventMap::iterator pos = events.begin(); CTimerEventMap::iterator pos = events.begin();
for(;pos != events.end();++pos) for (; pos != events.end(); ++pos)
{ {
CTimerEvent *event = pos->second; CTimerEvent *event = pos->second;
dprintf("shutdown: timer type %d state %d announceTime: %ld\n", event->eventType, event->eventState, event->announceTime); dprintf("shutdown: timer type %d state %d announceTime: %" PRId64 "\n", event->eventType, event->eventState, (int64_t)event->announceTime);
bool standby_on_timer = (event->eventType == CTimerd::TIMER_STANDBY && static_cast<CTimerEvent_Standby*>(event)->standby_on);// wakeup without CEC-on from depstanby bool standby_on_timer = (event->eventType == CTimerd::TIMER_STANDBY && static_cast<CTimerEvent_Standby*>(event)->standby_on); // wakeup without CEC-on from deep standby
if((event->eventType == CTimerd::TIMER_RECORD || if ((event->eventType == CTimerd::TIMER_RECORD ||
event->eventType == CTimerd::TIMER_EXEC_PLUGIN || //NI event->eventType == CTimerd::TIMER_EXEC_PLUGIN || //NI
event->eventType == CTimerd::TIMER_ZAPTO || standby_on_timer ) && event->eventType == CTimerd::TIMER_ZAPTO || standby_on_timer) &&
event->eventState < CTimerd::TIMERSTATE_ISRUNNING) event->eventState < CTimerd::TIMERSTATE_ISRUNNING)
{ {
// Wir wachen nur f<EFBFBD>r Records und Zaptos und Stanby-ON wieder auf // We wake up only for Records and Zaptos and Standby-ON
if(event->announceTime < nextAnnounceTime || nextAnnounceTime==0) if (event->announceTime < nextAnnounceTime || nextAnnounceTime == 0)
{ {
nextAnnounceTime=event->announceTime; nextAnnounceTime = event->announceTime;
dprintf("shutdown: nextAnnounceTime %ld\n", nextAnnounceTime); dprintf("shutdown: nextAnnounceTime %" PRId64 "\n", (int64_t)nextAnnounceTime);
if ( event->eventType == CTimerd::TIMER_RECORD || standby_on_timer ) if (event->eventType == CTimerd::TIMER_RECORD || standby_on_timer)
timer_is_rec = true; timer_is_rec = true;
else else
timer_is_rec = false; timer_is_rec = false;
@@ -796,12 +796,12 @@ bool CTimerManager::shutdown()
} }
timer_minutes = 0; timer_minutes = 0;
if(nextAnnounceTime != 0) if (nextAnnounceTime != 0)
{ {
timer_minutes = (nextAnnounceTime - 3*60)/60; timer_minutes = (nextAnnounceTime - 3 * 60) / 60;
} }
dprintf("shutdown: timeset: %d timer_minutes %ld\n", timeset, timer_minutes); dprintf("shutdown: timeset: %d timer_minutes %" PRId64 "\n", timeset, (int64_t)timer_minutes);
if(rc == 0) if (rc == 0)
pthread_mutex_unlock(&tm_eventsMutex); pthread_mutex_unlock(&tm_eventsMutex);
return status; return status;
} }