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

timerdclient: fix -Wstringop-truncation warnings

Browse Source 
Origin commit data
------------------
Commit: af3abc9b8e
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-01-30 (Thu, 30 Jan 2020)
This commit is contained in:
Markus Volk
2020-01-30 21:40:30 +01:00
committed by vanhofen
parent 165bf82bf2
commit d069fac302
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/timerdclient/timerdclient.cpp
View File

@@ -347,7 +347,7 @@ int CTimerdClient::addTimerEvent( CTimerd::CTimerEventTypes evType, void* data,
tri.recordingSafety = ri->recordingSafety;
tri.autoAdjustToEPG = ri->autoAdjustToEPG;
tri.channel_ci = ri->channel_ci; //NI
strncpy(tri.recordingDir, ri->recordingDir, RECORD_DIR_MAXLEN-1);
strncpy(tri.recordingDir, ri->recordingDir, RECORD_DIR_MAXLEN);
length = sizeof( CTimerd::TransferRecordingInfo);
data = &tri;
}

2
lib/timerdclient/timerdclient.h
View File

@@ -121,7 +121,7 @@ class CTimerdClient:private CBasicClient
eventInfo.recordingSafety = safety;
eventInfo.autoAdjustToEPG = autoAdjust;
eventInfo.channel_ci = channel_ci; //NI
strncpy(eventInfo.recordingDir, recDir.c_str(), RECORD_DIR_MAXLEN);
strncpy(eventInfo.recordingDir, recDir.c_str(), RECORD_DIR_MAXLEN-1);
return addTimerEvent(CTimerd::TIMER_RECORD, &eventInfo, announcetime, alarmtime, stoptime, evrepeat, repeatcount,forceAdd);
};

38
lib/timerdclient/timerdtypes.h
View File

@@ -34,7 +34,7 @@
#define REMINDER_MESSAGE_MAXLEN 31
#define EXEC_PLUGIN_NAME_MAXLEN 256
#define RECORD_DIR_MAXLEN 1024
#define RECORD_DIR_MAXLEN 1025
#define EPG_TITLE_MAXLEN 51
#define TIMERD_APIDS_CONF 0x00
@@ -46,14 +46,14 @@
class CTimerd
{
public:
enum CTimerEventRepeat
{
enum CTimerEventRepeat
{
TIMERREPEAT_ONCE = 0,
TIMERREPEAT_DAILY,
TIMERREPEAT_WEEKLY,
TIMERREPEAT_BIWEEKLY,
TIMERREPEAT_FOURWEEKLY,
TIMERREPEAT_MONTHLY,
TIMERREPEAT_DAILY,
TIMERREPEAT_WEEKLY,
TIMERREPEAT_BIWEEKLY,
TIMERREPEAT_FOURWEEKLY,
TIMERREPEAT_MONTHLY,
TIMERREPEAT_BYEVENTDESCRIPTION,
TIMERREPEAT_WEEKDAYS = 0x100 // Bits 9-15 specify weekdays (9=mo,10=di,...)
};
@@ -71,14 +71,14 @@ class CTimerd
TIMER_IMMEDIATE_RECORD,
TIMER_REMOTEBOX
};
enum CTimerEventStates
{
TIMERSTATE_SCHEDULED,
TIMERSTATE_PREANNOUNCE,
TIMERSTATE_ISRUNNING,
TIMERSTATE_HASFINISHED,
TIMERSTATE_TERMINATED
enum CTimerEventStates
{
TIMERSTATE_SCHEDULED,
TIMERSTATE_PREANNOUNCE,
TIMERSTATE_ISRUNNING,
TIMERSTATE_HASFINISHED,
TIMERSTATE_TERMINATED
};
struct EventInfo
@@ -148,7 +148,7 @@ class CTimerd
};
struct responseGetTimer
{
{
int eventID;
CTimerEventTypes eventType;
CTimerEventStates eventState;
@@ -170,13 +170,13 @@ class CTimerd
int rem_pre;
int rem_post;
bool channel_ci; //NI
bool operator< (const responseGetTimer& a) const
{
return this->alarmTime < a.alarmTime ;
}
};
typedef std::vector<responseGetTimer> TimerList;
};
#endif